summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2014-06-26 12:28:57 -0400
committerTheodore Ts'o <tytso@mit.edu>2014-06-26 12:28:57 -0400
commit77ea2a4ba657a1ad4fb7c64bc5cdce84b8a132b6 (patch)
tree685cfe8f3bb5e96a2be066a88065bf762928a559 /fs
parente43bb4e612b402a631bc549ac496f78bc7a79438 (diff)
downloadlinux-77ea2a4ba657a1ad4fb7c64bc5cdce84b8a132b6.tar.bz2
ext4: Fix block zeroing when punching holes in indirect block files
free_holes_block() passed local variable as a block pointer to ext4_clear_blocks(). Thus ext4_clear_blocks() zeroed out this local variable instead of proper place in inode / indirect block. We later zero out proper place in inode / indirect block but don't dirty the inode / buffer again which can lead to subtle issues (some changes e.g. to inode can be lost). Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/indirect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c
index f85bafd474dc..6f3bb55567b6 100644
--- a/fs/ext4/indirect.c
+++ b/fs/ext4/indirect.c
@@ -1335,8 +1335,8 @@ static int free_hole_blocks(handle_t *handle, struct inode *inode,
if (level == 0 ||
(bh && all_zeroes((__le32 *)bh->b_data,
(__le32 *)bh->b_data + addr_per_block))) {
- ext4_free_data(handle, inode, parent_bh, &blk, &blk+1);
- *i_data = 0;
+ ext4_free_data(handle, inode, parent_bh,
+ i_data, i_data + 1);
}
brelse(bh);
bh = NULL;