From 05bffbf831272ab358191ed03ade8bb569fa57ef Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Mon, 22 Feb 2016 23:00:01 -0500 Subject: [PATCH] add patch trim-unused-params-from-convert_initialized_extent --- series | 2 ++ timestamps | 7 +++-- trim-unused-params-from-convert_initialized_extent | 34 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 trim-unused-params-from-convert_initialized_extent diff --git a/series b/series index d992e459..a83ae450 100644 --- a/series +++ b/series @@ -15,6 +15,8 @@ get-rid-of-e_hash_list_head shortcut-setting-of-xattr-to-the-same-value add-reusable-flag-to-cache-entries +trim-unused-params-from-convert_initialized_extent + ########################################## # unstable patches #################################################### diff --git a/timestamps b/timestamps index 77d83c97..7a9775b7 100755 --- a/timestamps +++ b/timestamps @@ -30,7 +30,6 @@ touch -d @1453098259 crypto-add-ciphertext_access-mount-option touch -d @1455600079 stable-boundary touch -d @1456097501 make-sure-to-revoke-all-the-freeable-blocks-in-ext4_free_blocks touch -d @1456097924 iterate-over-buffer-heads-correctly-in-move_extent_per_page -touch -d @1456098126 timestamps touch -d @1456159749 reimplement-mbcache touch -d @1456159813 ext4-convert-to-mbcache2 touch -d @1456160198 ext2-convert-to-mbcache2 @@ -42,5 +41,7 @@ touch -d @1456198865 kill-ext4_mballoc_ready touch -d @1456198925 get-rid-of-e_hash_list_head touch -d @1456198984 shortcut-setting-of-xattr-to-the-same-value touch -d @1456199044 add-reusable-flag-to-cache-entries -touch -d @1456199094 series -touch -d @1456199097 status +touch -d @1456199108 timestamps +touch -d @1456199406 series +touch -d @1456199935 trim-unused-params-from-convert_initialized_extent +touch -d @1456199941 status diff --git a/trim-unused-params-from-convert_initialized_extent b/trim-unused-params-from-convert_initialized_extent new file mode 100644 index 00000000..606ef96b --- /dev/null +++ b/trim-unused-params-from-convert_initialized_extent @@ -0,0 +1,34 @@ +ext4: trim unused parameter from convert_initialized_extent() + +From: Eric Whitney + +The flags parameter is also unused. + +Signed-off-by: Eric Whitney +Signed-off-by: Theodore Ts'o +--- + fs/ext4/extents.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c +index 3753ceb..73a48c1 100644 +--- a/fs/ext4/extents.c ++++ b/fs/ext4/extents.c +@@ -3927,7 +3927,7 @@ get_reserved_cluster_alloc(struct inode *inode, ext4_lblk_t lblk_start, + static int + convert_initialized_extent(handle_t *handle, struct inode *inode, + struct ext4_map_blocks *map, +- struct ext4_ext_path **ppath, int flags, ++ struct ext4_ext_path **ppath, + unsigned int allocated) + { + struct ext4_ext_path *path = *ppath; +@@ -4347,7 +4347,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode, + (flags & EXT4_GET_BLOCKS_CONVERT_UNWRITTEN)) { + allocated = convert_initialized_extent( + handle, inode, map, &path, +- flags, allocated); ++ allocated); + goto out2; + } else if (!ext4_ext_is_unwritten(ex)) + goto out; -- 2.11.4.GIT