Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

torvalds · torvalds · commit f77637206d7b · 2013-01-07T09:22:50.000-08:00
Pull ext4 regression fixes from Ted Ts'o:
 "Bug fixes, including two regressions introduced in v3.8.  The most
  serious of these regressions is a buffer cache leak."

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: remove duplicate call to ext4_bread() in ext4_init_new_dir()
  ext4: release buffer in failed path in dx_probe()
  ext4: fix configuration dependencies for ext4 ACLs and security labels
diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig
@@ -41,6 +41,7 @@ config EXT4_USE_FOR_EXT23
 
 config EXT4_FS_POSIX_ACL
 	bool "Ext4 POSIX Access Control Lists"
+	depends on EXT4_FS
 	select FS_POSIX_ACL
 	help
 	  POSIX Access Control Lists (ACLs) support permissions for users and
@@ -53,6 +54,7 @@ config EXT4_FS_POSIX_ACL
 
 config EXT4_FS_SECURITY
 	bool "Ext4 Security Labels"
+	depends on EXT4_FS
 	help
 	  Security labels support alternative access control models
 	  implemented by security modules like SELinux.  This option
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
@@ -722,7 +722,7 @@ dx_probe(const struct qstr *d_name, struct inode *dir,
 			ext4_warning(dir->i_sb, "Node failed checksum");
 			brelse(bh);
 			*err = ERR_BAD_DX_DIR;
-			goto fail;
+			goto fail2;
 		}
 		set_buffer_verified(bh);
 
@@ -2368,7 +2368,6 @@ static int ext4_init_new_dir(handle_t *handle, struct inode *dir,
 	}
 
 	inode->i_size = EXT4_I(inode)->i_disksize = blocksize;
-	dir_block = ext4_bread(handle, inode, 0, 1, &err);
 	if (!(dir_block = ext4_bread(handle, inode, 0, 1, &err))) {
 		if (!err) {
 			err = -EIO;

Original file line number	Diff line number	Diff line change
`@@ -722,7 +722,7 @@ dx_probe(const struct qstr d_name, struct inode dir,`
`722`	`722`	`ext4_warning(dir->i_sb, "Node failed checksum");`
`723`	`723`	`brelse(bh);`
`724`	`724`	`*err = ERR_BAD_DX_DIR;`
`725`		`- goto fail;`
	`725`	`+ goto fail2;`
`726`	`726`	`}`
`727`	`727`	`set_buffer_verified(bh);`
`728`	`728`
`@@ -2368,7 +2368,6 @@ static int ext4_init_new_dir(handle_t handle, struct inode dir,`
`2368`	`2368`	`}`
`2369`	`2369`
`2370`	`2370`	`inode->i_size = EXT4_I(inode)->i_disksize = blocksize;`
`2371`		`- dir_block = ext4_bread(handle, inode, 0, 1, &err);`
`2372`	`2371`	`if (!(dir_block = ext4_bread(handle, inode, 0, 1, &err))) {`
`2373`	`2372`	`if (!err) {`
`2374`	`2373`	`err = -EIO;`