From c6a0778202af20c0a4e0775dd67086d6662668dc Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sat, 30 Aug 2014 23:07:04 -0400 Subject: [PATCH] add patch remove-a-duplicate-call-in-ext4_init_new_dir --- remove-a-duplicate-call-in-ext4_init_new_dir | 36 ++++++++++++++++++++++++++++ series | 2 ++ timestamps | 7 +++--- 3 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 remove-a-duplicate-call-in-ext4_init_new_dir diff --git a/remove-a-duplicate-call-in-ext4_init_new_dir b/remove-a-duplicate-call-in-ext4_init_new_dir new file mode 100644 index 00000000..c9e8f289 --- /dev/null +++ b/remove-a-duplicate-call-in-ext4_init_new_dir @@ -0,0 +1,36 @@ +ext4: remove a duplicate call in ext4_init_new_dir() + +From: Wang Shilong + +ext4_journal_get_write_access() has just been called in ext4_append() +calling it again here is duplicated. + +Signed-off-by: Wang Shilong +Signed-off-by: Theodore Ts'o +--- + 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 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-ext4" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + diff --git a/series b/series index 1e5fc502..11c6cfb9 100644 --- a/series +++ b/series @@ -6,6 +6,8 @@ convert-ext4_bread-to-use-the-ERR_PTR-convention convert-dx_probe-to-use-the-ERR_PTR-convention convert-do_split-to-use-the-ERR_PTR-convention +remove-a-duplicate-call-in-ext4_init_new_dir + ########################################## # unstable patches #################################################### diff --git a/timestamps b/timestamps index 59a0eedd..367d05f6 100755 --- a/timestamps +++ b/timestamps @@ -18,10 +18,11 @@ touch -d @1409339026 dump-in-use-buffers touch -d @1409339086 akpm-jbd2-locking-fix touch -d @1409359791 convert-ext4_dx_find_entry-to-use-the-ERR_PTR-convention touch -d @1409359892 convert-ext4_getblk-to-use-the-ERR_PTR-convention -touch -d @1409359911 series touch -d @1409359935 convert-ext4_bread-to-use-the-ERR_PTR-convention touch -d @1409359937 convert-dx_probe-to-use-the-ERR_PTR-convention touch -d @1409359938 convert-do_split-to-use-the-ERR_PTR-convention touch -d @1409359943 stable-boundary -touch -d @1409359947 status -touch -d @1409368610 timestamps +touch -d @1409368844 remove-a-duplicate-call-in-ext4_init_new_dir +touch -d @1409368947 series +touch -d @1409368951 status +touch -d @1409454414 timestamps -- 2.11.4.GIT