[PATCH] ext4: remove a duplicate call in ext4_init_new_dir()

[PATCH] ext4: remove a duplicate call in ext4_init_new_dir()

[Wang Shilong]

From: Wang Shilong <wshilong@ddn.com>

ext4_journal_get_write_access() has just been called in ext4_append()
calling it again here is duplicated.

Signed-off-by: Wang Shilong <wshilong@ddn.com>
---
 fs/ext4/namei.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 3520ab8..6d0d01f 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2390,10 +2390,6 @@ static int ext4_init_new_dir(handle_t *handle, struct inode *dir,
 	dir_block = ext4_append(handle, inode, &block);
 	if (IS_ERR(dir_block))
 		return PTR_ERR(dir_block);
-	BUFFER_TRACE(dir_block, "get_write_access");
-	err = ext4_journal_get_write_access(handle, dir_block);
-	if (err)
-		goto out;
 	de = (struct ext4_dir_entry_2 *)dir_block->b_data;
 	ext4_init_dot_dotdot(inode, de, blocksize, csum_size, dir->i_ino, 0);
 	set_nlink(inode, 2);
-- 
1.9.3

Re: [PATCH] ext4: remove a duplicate call in ext4_init_new_dir()

[Wang Shilong]

Any comments on this cleanup patch?

> From: Wang Shilong <wshilong@ddn.com>
> 
> ext4_journal_get_write_access() has just been called in ext4_append()
> calling it again here is duplicated.
> 
> Signed-off-by: Wang Shilong <wshilong@ddn.com>
> ---
> fs/ext4/namei.c | 4 ----
> 1 file changed, 4 deletions(-)
> 
> diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
> index 3520ab8..6d0d01f 100644
> --- a/fs/ext4/namei.c
> +++ b/fs/ext4/namei.c
> @@ -2390,10 +2390,6 @@ static int ext4_init_new_dir(handle_t *handle, struct inode *dir,
> 	dir_block = ext4_append(handle, inode, &block);
> 	if (IS_ERR(dir_block))
> 		return PTR_ERR(dir_block);
> -	BUFFER_TRACE(dir_block, "get_write_access");
> -	err = ext4_journal_get_write_access(handle, dir_block);
> -	if (err)
> -		goto out;
> 	de = (struct ext4_dir_entry_2 *)dir_block->b_data;
> 	ext4_init_dot_dotdot(inode, de, blocksize, csum_size, dir->i_ino, 0);
> 	set_nlink(inode, 2);
> -- 
> 1.9.3
> 

Best Regards,
Wang Shilong

Re: [PATCH] ext4: remove a duplicate call in ext4_init_new_dir()

[Theodore Ts'o]

On Wed, Aug 20, 2014 at 01:21:55AM +0800, Wang Shilong wrote:
> Any comments on this cleanup patch?

Looks good.  This got sent just before the merge window opened, and
this week has been the Kernel Summit / LinuxCon North America.  So I
haven't started accepting patches to the ext4 git tree just yet.  Now
that the event is open, we'll start with regression fixes and high
priority bug fixes that need to go to Linus before 3.17 is released,
and then cleanup and patch fixups.

Cheers,

						- Ted

Re: [PATCH] ext4: remove a duplicate call in ext4_init_new_dir()

[Wang Shilong]

Hi Ted,

> On Wed, Aug 20, 2014 at 01:21:55AM +0800, Wang Shilong wrote:
>> Any comments on this cleanup patch?
> 
> Looks good.  This got sent just before the merge window opened, and
> this week has been the Kernel Summit / LinuxCon North America.  So I
> haven't started accepting patches to the ext4 git tree just yet.  Now
> that the event is open, we'll start with regression fixes and high
> priority bug fixes that need to go to Linus before 3.17 is released,
> and then cleanup and patch mixups.

Thanks for detailed information!

> 
> Cheers,
> 
> 						- Ted

Best Regards,
Wang Shilong

Re: [PATCH] ext4: remove a duplicate call in ext4_init_new_dir()

[Theodore Ts'o]

On Tue, Aug 12, 2014 at 11:18:29PM +0800, Wang Shilong wrote:
> From: Wang Shilong <wshilong@ddn.com>
> 
> ext4_journal_get_write_access() has just been called in ext4_append()
> calling it again here is duplicated.
> 
> Signed-off-by: Wang Shilong <wshilong@ddn.com>

Thanks, applied.

					- Ted