* [PATCH 1/2] EXT4: Punch Hole Optimizations: Skip un-needed extent lookup
2011-06-27 22:49 [PATCH 0/2] EXT4: Punch Hole Opmtimizations Allison Henderson
@ 2011-06-27 22:49 ` Allison Henderson
2011-07-18 3:22 ` Ted Ts'o
2011-06-27 22:49 ` [PATCH 2/2] EXT4: Punch Hole Optimizations: Removed un-needed ext4_ext_remove_space param Allison Henderson
2011-06-27 23:36 ` [PATCH 0/2] EXT4: Punch Hole Opmtimizations Allison Henderson
2 siblings, 1 reply; 6+ messages in thread
From: Allison Henderson @ 2011-06-27 22:49 UTC (permalink / raw)
To: linux-ext4; +Cc: Allison Henderson
This patch optimizes the punch hole operation by skipping the
tree walking code that is used by truncate. Since punch hole
is done through map blocks, the path to the extent is already
known in this function, so we do not need to look it up again.
Signed-off-by: Allison Henderson <achender@linux.vnet.ibm.com>
---
v2->v3
Rebased to apply onto latest ext4 code
:100644 100644 f815cc8... dc5a077... M fs/ext4/extents.c
fs/ext4/extents.c | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index f815cc8..dc5a077 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -3497,8 +3497,27 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
ext4_ext_mark_uninitialized(ex);
- err = ext4_ext_remove_space(inode, map->m_lblk,
- map->m_lblk + punched_out);
+ ext4_ext_invalidate_cache(inode);
+
+ err = ext4_ext_rm_leaf(handle, inode, path,
+ map->m_lblk, map->m_lblk + punched_out);
+
+ if (!err && path->p_hdr->eh_entries == 0) {
+ /*
+ * Punch hole freed all of this sub tree,
+ * so we need to correct eh_depth
+ */
+ err = ext4_ext_get_access(handle, inode, path);
+ if (err == 0) {
+ ext_inode_hdr(inode)->eh_depth = 0;
+ ext_inode_hdr(inode)->eh_max =
+ cpu_to_le16(ext4_ext_space_root(
+ inode, 0));
+
+ err = ext4_ext_dirty(
+ handle, inode, path);
+ }
+ }
goto out2;
}
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] EXT4: Punch Hole Optimizations: Removed un-needed ext4_ext_remove_space param
2011-06-27 22:49 [PATCH 0/2] EXT4: Punch Hole Opmtimizations Allison Henderson
2011-06-27 22:49 ` [PATCH 1/2] EXT4: Punch Hole Optimizations: Skip un-needed extent lookup Allison Henderson
@ 2011-06-27 22:49 ` Allison Henderson
2011-07-18 3:23 ` Ted Ts'o
2011-06-27 23:36 ` [PATCH 0/2] EXT4: Punch Hole Opmtimizations Allison Henderson
2 siblings, 1 reply; 6+ messages in thread
From: Allison Henderson @ 2011-06-27 22:49 UTC (permalink / raw)
To: linux-ext4; +Cc: Allison Henderson
This patch removes the extra parameter in the ext4_ext_remove_space
routine which is no longer needed.
Signed-off-by: Allison Henderson <achender@linux.vnet.ibm.com>
---
v1->v2
Added patch 2/2 to remove uneeded parameter
v2->v3
Rebased to apply onto latest ext4 code
:100644 100644 dc5a077... 3579822... M fs/ext4/extents.c
fs/ext4/extents.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index dc5a077..3579822 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -2534,8 +2534,7 @@ ext4_ext_more_to_rm(struct ext4_ext_path *path)
return 1;
}
-static int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start,
- ext4_lblk_t end)
+static int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start)
{
struct super_block *sb = inode->i_sb;
int depth = ext_depth(inode);
@@ -2575,7 +2574,7 @@ again:
if (i == depth) {
/* this is leaf block */
err = ext4_ext_rm_leaf(handle, inode, path,
- start, end);
+ start, EXT_MAX_BLOCKS - 1);
/* root level has p_bh == NULL, brelse() eats this */
brelse(path[i].p_bh);
path[i].p_bh = NULL;
@@ -3718,7 +3717,7 @@ void ext4_ext_truncate(struct inode *inode)
last_block = (inode->i_size + sb->s_blocksize - 1)
>> EXT4_BLOCK_SIZE_BITS(sb);
- err = ext4_ext_remove_space(inode, last_block, EXT_MAX_BLOCKS - 1);
+ err = ext4_ext_remove_space(inode, last_block);
/* In a multi-transaction truncate, we only make the final
* transaction synchronous.
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/2] EXT4: Punch Hole Opmtimizations
2011-06-27 22:49 [PATCH 0/2] EXT4: Punch Hole Opmtimizations Allison Henderson
2011-06-27 22:49 ` [PATCH 1/2] EXT4: Punch Hole Optimizations: Skip un-needed extent lookup Allison Henderson
2011-06-27 22:49 ` [PATCH 2/2] EXT4: Punch Hole Optimizations: Removed un-needed ext4_ext_remove_space param Allison Henderson
@ 2011-06-27 23:36 ` Allison Henderson
2 siblings, 0 replies; 6+ messages in thread
From: Allison Henderson @ 2011-06-27 23:36 UTC (permalink / raw)
To: Allison Henderson, Ext4 Developers List
Sorry, I just noticed I missed the version number on this set. This is
v3 of this patch set. I just switched to a different mailer to help
keep the threading correct for people, but please let me know if anyone
notices any other oddities about it. Thx!
Allison Henderson
^ permalink raw reply [flat|nested] 6+ messages in thread