Skip to content

Commit

Permalink
ext4: Fix block zeroing when punching holes in indirect block files
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jan Kara authored and Theodore Ts'o committed Jun 26, 2014
1 parent e43bb4e commit 77ea2a4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions fs/ext4/indirect.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 77ea2a4

Please sign in to comment.