Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef24f6c2 authored by Lukas Czerner's avatar Lukas Czerner Committed by Theodore Ts'o
Browse files

ext4: discard preallocations after removing space 



Currently in ext4_collapse_range() and ext4_punch_hole() we're
discarding preallocation twice. Once before we attempt to do any changes
and second time after we're done with the changes.

While the second call to ext4_discard_preallocations() in
ext4_punch_hole() case is not needed, we need to discard preallocation
right after ext4_ext_remove_space() in collapse range case because in
the case we had to restart a transaction in the middle of removing space
we might have new preallocations created.

Remove unneeded ext4_discard_preallocations() ext4_punch_hole() and move
it to the better place in ext4_collapse_range()

Signed-off-by: default avatarLukas Czerner <lczerner@redhat.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 9337d5d3

fs/ext4/extents.c

+1 −1
Original line number Diff line number Diff line
@@ -5465,6 +5465,7 @@ int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len) 
		up_write(&EXT4_I(inode)->i_data_sem);

		goto out_stop;

	}

	ext4_discard_preallocations(inode);



	ret = ext4_ext_shift_extents(inode, handle, punch_stop,

				     punch_stop - punch_start);
@@ -5477,7 +5478,6 @@ int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len) 
	i_size_write(inode, new_size);

	EXT4_I(inode)->i_disksize = new_size;



	ext4_discard_preallocations(inode);

	up_write(&EXT4_I(inode)->i_data_sem);

	if (IS_SYNC(inode))

		ext4_handle_sync(handle);

fs/ext4/inode.c

+0 −1
Original line number Diff line number Diff line
@@ -3621,7 +3621,6 @@ int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length) 
		ret = ext4_free_hole_blocks(handle, inode, first_block,

					    stop_block);



	ext4_discard_preallocations(inode);

	up_write(&EXT4_I(inode)->i_data_sem);

	if (IS_SYNC(inode))

		ext4_handle_sync(handle);