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

Commit 62c821a8 authored by Liu Bo's avatar Liu Bo Committed by David Sterba
Browse files

Btrfs: clean up btrfs_ordered_update_i_size 



Since we have a good helper entry_end, use it for ordered extent.

Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
[ whitespace reformatting ]
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 5416034f

fs/btrfs/ordered-data.c

+13 −16
Original line number Diff line number Diff line
@@ -1042,26 +1042,23 @@ int btrfs_ordered_update_i_size(struct inode *inode, u64 offset, 
		/* We treat this entry as if it doesn't exist */

		if (test_bit(BTRFS_ORDERED_UPDATED_ISIZE, &test->flags))

			continue;

		if (test->file_offset + test->len <= disk_i_size)



		if (entry_end(test) <= disk_i_size)

			break;

		if (test->file_offset >= i_size)

			break;

		if (entry_end(test) > disk_i_size) {



		/*

			 * we don't update disk_i_size now, so record this

			 * undealt i_size. Or we will not know the real

			 * i_size.

		 * We don't update disk_i_size now, so record this undealt

		 * i_size. Or we will not know the real i_size.

		 */

		if (test->outstanding_isize < offset)

			test->outstanding_isize = offset;

		if (ordered &&

			    ordered->outstanding_isize >

			    test->outstanding_isize)

				test->outstanding_isize =

						ordered->outstanding_isize;

		    ordered->outstanding_isize > test->outstanding_isize)

			test->outstanding_isize = ordered->outstanding_isize;

		goto out;

	}

	}

	new_i_size = min_t(u64, offset, i_size);



	/*