Re: [PATCH 02/10] btrfs: remove uptodate parameter from btrfs_dec_test_first_ordered_pending

[Qu Wenruo <quwenruo.btrfs@gmx.com>]

On 2021/7/26 下午8:15, David Sterba wrote:
> In commit e65f152e4348 ("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.

I should have noticed that...

>
> Signed-off-by: David Sterba <dsterba@suse.com>

Reviewed-by: Qu Wenruo <wqu@suse.com>

Thanks,
Qu
> ---
>   fs/btrfs/inode.c        | 2 +-
>   fs/btrfs/ordered-data.c | 5 +----
>   fs/btrfs/ordered-data.h | 2 +-
>   3 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index 43b1393eec67..ba0bba9f5505 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -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
> diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
> index 5c0f8481e25e..edb65abf0393 100644
> --- a/fs/btrfs/ordered-data.c
> +++ b/fs/btrfs/ordered-data.c
> @@ -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) {
>   		/*
> diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h
> index b2d88aba8420..4194e960ff61 100644
> --- a/fs/btrfs/ordered-data.h
> +++ b/fs/btrfs/ordered-data.h
> @@ -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);
>