Commit f41b6ba9 authored by David Sterba's avatar David Sterba
Browse files

btrfs: remove uptodate parameter from btrfs_dec_test_first_ordered_pending 



In commit e65f152e ("btrfs: refactor how we finish ordered extent io
for endio functions") there was last caller not using 1 for the uptodate
parameter. Now there's only one, passing 1, so we can remove it and
simplify the code.

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 25c1252a

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -8554,7 +8554,7 @@ static void btrfs_invalidatepage(struct page *page, unsigned int offset, 
		spin_unlock_irq(&inode->ordered_tree.lock);



		if (btrfs_dec_test_ordered_pending(inode, &ordered,

					cur, range_end + 1 - cur, 1)) {

						   cur, range_end + 1 - cur)) {

			btrfs_finish_ordered_io(ordered);

			/*

			 * The ordered extent has finished, now we're again

fs/btrfs/ordered-data.c

+1 −4
Original line number Diff line number Diff line
@@ -446,7 +446,6 @@ void btrfs_mark_ordered_io_finished(struct btrfs_inode *inode, 
 * 		 Will be also used to store the finished ordered extent.

 * @file_offset: File offset for the finished IO

 * @io_size:	 Length of the finish IO range

 * @uptodate:	 If the IO finishes without problem

 *

 * Return true if the ordered extent is finished in the range, and update

 * @cached.
@@ -457,7 +456,7 @@ void btrfs_mark_ordered_io_finished(struct btrfs_inode *inode, 
 */

bool btrfs_dec_test_ordered_pending(struct btrfs_inode *inode,

				    struct btrfs_ordered_extent **cached,

				    u64 file_offset, u64 io_size, int uptodate)

				    u64 file_offset, u64 io_size)

{

	struct btrfs_ordered_inode_tree *tree = &inode->ordered_tree;

	struct rb_node *node;
@@ -486,8 +485,6 @@ bool btrfs_dec_test_ordered_pending(struct btrfs_inode *inode, 
		       entry->bytes_left, io_size);



	entry->bytes_left -= io_size;

	if (!uptodate)

		set_bit(BTRFS_ORDERED_IOERR, &entry->flags);



	if (entry->bytes_left == 0) {

		/*

fs/btrfs/ordered-data.h

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ void btrfs_mark_ordered_io_finished(struct btrfs_inode *inode, 
				bool uptodate);

bool btrfs_dec_test_ordered_pending(struct btrfs_inode *inode,

				    struct btrfs_ordered_extent **cached,

				    u64 file_offset, u64 io_size, int uptodate);

				    u64 file_offset, u64 io_size);

int btrfs_add_ordered_extent(struct btrfs_inode *inode, u64 file_offset,

			     u64 disk_bytenr, u64 num_bytes, u64 disk_num_bytes,

			     int type);