summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAshish Sangwan <a.sangwan@samsung.com>2013-07-01 14:12:41 +0200
committerTheodore Ts'o <tytso@mit.edu>2013-07-01 14:12:41 +0200
commit6ae06ff51eab5dcbbf959b05ce0f11003a305ba5 (patch)
tree0205ef491e599b188fc653872c166db57ae3b482
parentjbd2: invalidate handle if jbd2_journal_restart() fails (diff)
downloadlinux-6ae06ff51eab5dcbbf959b05ce0f11003a305ba5.tar.xz
linux-6ae06ff51eab5dcbbf959b05ce0f11003a305ba5.zip
ext4: optimize starting extent in ext4_ext_rm_leaf()
Both hole punch and truncate use ext4_ext_rm_leaf() for removing blocks. Currently we choose the last extent as the starting point for removing blocks: ex = EXT_LAST_EXTENT(eh); This is OK for truncate but for hole punch we can optimize the extent selection as the path is already initialized. We could use this information to select proper starting extent. The code change in this patch will not affect truncate as for truncate path[depth].p_ext will always be NULL. Signed-off-by: Ashish Sangwan <a.sangwan@samsung.com> Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rw-r--r--fs/ext4/extents.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 575faa090253..7097b0f680e6 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -2504,7 +2504,9 @@ ext4_ext_rm_leaf(handle_t *handle, struct inode *inode,
return -EIO;
}
/* find where to start removing */
- ex = EXT_LAST_EXTENT(eh);
+ ex = path[depth].p_ext;
+ if (!ex)
+ ex = EXT_LAST_EXTENT(eh);
ex_ee_block = le32_to_cpu(ex->ee_block);
ex_ee_len = ext4_ext_get_actual_len(ex);