diff options
| author | Jan Kara <jack@suse.cz> | 2014-06-26 12:28:57 -0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-08-26 14:12:06 +0200 |
| commit | 056a01ab3c65605a16aa4841de0530d9d3d66b9f (patch) | |
| tree | f9897ddaf8835fee6e0532a1ab16b883a65e9f96 | |
| parent | 8b18c0adbc5d0cb1530692e72bcfb88fd7bb77bb (diff) | |
ext4: Fix block zeroing when punching holes in indirect block files
commit 77ea2a4ba657a1ad4fb7c64bc5cdce84b8a132b6 upstream.
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | fs/ext4/indirect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c index e6574d7b6642..c30cbe291e30 100644 --- a/fs/ext4/indirect.c +++ b/fs/ext4/indirect.c @@ -1345,8 +1345,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; |