Commit 711f447b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba
Browse files

btrfs: remove the finish_func argument to btrfs_mark_ordered_io_finished 



finish_func is always set to finish_ordered_fn, so remove it and also
the now pointless and somewhat confusingly named
__endio_write_update_ordered wrapper.

Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 1f4f639f

fs/btrfs/inode.c

+9 −31
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ struct kmem_cache *btrfs_free_space_bitmap_cachep; 


static int btrfs_setsize(struct inode *inode, struct iattr *attr);

static int btrfs_truncate(struct inode *inode, bool skip_writeback);

static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent);

static noinline int cow_file_range(struct btrfs_inode *inode,

				   struct page *locked_page,

				   u64 start, u64 end, int *page_started,
@@ -125,10 +124,6 @@ static struct extent_map *create_io_em(struct btrfs_inode *inode, u64 start, 
				       u64 ram_bytes, int compress_type,

				       int type);



static void __endio_write_update_ordered(struct btrfs_inode *inode,

					 const u64 offset, const u64 bytes,

					 const bool uptodate);



/*

 * btrfs_inode_lock - lock inode i_rwsem based on arguments passed

 *
@@ -223,7 +218,7 @@ static inline void btrfs_cleanup_ordered_extents(struct btrfs_inode *inode, 


		/*

		 * Here we just clear all Ordered bits for every page in the

		 * range, then __endio_write_update_ordered() will handle

		 * range, then btrfs_mark_ordered_io_finished() will handle

		 * the ordered extent accounting for the range.

		 */

		btrfs_page_clamp_clear_ordered(inode->root->fs_info, page,
@@ -244,7 +239,7 @@ static inline void btrfs_cleanup_ordered_extents(struct btrfs_inode *inode, 
		offset = page_offset(locked_page) + PAGE_SIZE;

	}



	return __endio_write_update_ordered(inode, offset, bytes, false);

	return btrfs_mark_ordered_io_finished(inode, NULL, offset, bytes, false);

}



static int btrfs_dirty_inode(struct inode *inode);
@@ -3086,7 +3081,7 @@ static int insert_ordered_extent_file_extent(struct btrfs_trans_handle *trans, 
 * an ordered extent if the range of bytes in the file it covers are

 * fully written.

 */

static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)

int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)

{

	struct btrfs_inode *inode = BTRFS_I(ordered_extent->inode);

	struct btrfs_root *root = inode->root;
@@ -3295,21 +3290,13 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) 
	return ret;

}



static void finish_ordered_fn(struct btrfs_work *work)

{

	struct btrfs_ordered_extent *ordered_extent;

	ordered_extent = container_of(work, struct btrfs_ordered_extent, work);

	btrfs_finish_ordered_io(ordered_extent);

}



void btrfs_writepage_endio_finish_ordered(struct btrfs_inode *inode,

					  struct page *page, u64 start,

					  u64 end, bool uptodate)

{

	trace_btrfs_writepage_end_io_hook(inode, start, end, uptodate);



	btrfs_mark_ordered_io_finished(inode, page, start, end + 1 - start,

				       finish_ordered_fn, uptodate);

	btrfs_mark_ordered_io_finished(inode, page, start, end + 1 - start, uptodate);

}



/*
@@ -7827,8 +7814,8 @@ static int btrfs_dio_iomap_end(struct inode *inode, loff_t pos, loff_t length, 
		pos += submitted;

		length -= submitted;

		if (write)

			__endio_write_update_ordered(BTRFS_I(inode), pos,

					length, false);

			btrfs_mark_ordered_io_finished(BTRFS_I(inode), NULL,

						       pos, length, false);

		else

			unlock_extent(&BTRFS_I(inode)->io_tree, pos,

				      pos + length - 1);
@@ -7850,9 +7837,8 @@ static void btrfs_dio_private_put(struct btrfs_dio_private *dip) 
		return;



	if (btrfs_op(&dip->bio) == BTRFS_MAP_WRITE) {

		__endio_write_update_ordered(BTRFS_I(dip->inode),

					     dip->file_offset,

					     dip->bytes,

		btrfs_mark_ordered_io_finished(BTRFS_I(dip->inode), NULL,

					       dip->file_offset, dip->bytes,

					       !dip->bio.bi_status);

	} else {

		unlock_extent(&BTRFS_I(dip->inode)->io_tree,
@@ -7916,14 +7902,6 @@ static blk_status_t btrfs_check_read_dio_bio(struct btrfs_dio_private *dip, 
	return err;

}



static void __endio_write_update_ordered(struct btrfs_inode *inode,

					 const u64 offset, const u64 bytes,

					 const bool uptodate)

{

	btrfs_mark_ordered_io_finished(inode, NULL, offset, bytes,

				       finish_ordered_fn, uptodate);

}



static blk_status_t btrfs_submit_bio_start_direct_io(struct inode *inode,

						     struct bio *bio,

						     u64 dio_file_offset)

fs/btrfs/ordered-data.c

+11 −6
Original line number Diff line number Diff line
@@ -272,6 +272,14 @@ void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry, 
	spin_unlock_irq(&tree->lock);

}



static void finish_ordered_fn(struct btrfs_work *work)

{

	struct btrfs_ordered_extent *ordered_extent;



	ordered_extent = container_of(work, struct btrfs_ordered_extent, work);

	btrfs_finish_ordered_io(ordered_extent);

}



/*

 * Mark all ordered extents io inside the specified range finished.

 *
@@ -281,16 +289,13 @@ void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry, 
 *		 Can be NULL for direct IO and compressed write.

 *		 For these cases, callers are ensured they won't execute the

 *		 endio function twice.

 * @finish_func: The function to be executed when all the IO of an ordered

 *		 extent are finished.

 *

 * This function is called for endio, thus the range must have ordered

 * extent(s) covering it.

 */

void btrfs_mark_ordered_io_finished(struct btrfs_inode *inode,

				    struct page *page, u64 file_offset,

				u64 num_bytes, btrfs_func_t finish_func,

				bool uptodate)

				    u64 num_bytes, bool uptodate)

{

	struct btrfs_ordered_inode_tree *tree = &inode->ordered_tree;

	struct btrfs_fs_info *fs_info = inode->root->fs_info;
@@ -403,7 +408,7 @@ void btrfs_mark_ordered_io_finished(struct btrfs_inode *inode, 
			refcount_inc(&entry->refs);

			trace_btrfs_ordered_extent_mark_finished(inode, entry);

			spin_unlock_irqrestore(&tree->lock, flags);

			btrfs_init_work(&entry->work, finish_func, NULL, NULL);

			btrfs_init_work(&entry->work, finish_ordered_fn, NULL, NULL);

			btrfs_queue_work(wq, &entry->work);

			spin_lock_irqsave(&tree->lock, flags);

		}

fs/btrfs/ordered-data.h

+3 −2
Original line number Diff line number Diff line
@@ -180,13 +180,14 @@ btrfs_ordered_inode_tree_init(struct btrfs_ordered_inode_tree *t) 
	t->last = NULL;

}



int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent);



void btrfs_put_ordered_extent(struct btrfs_ordered_extent *entry);

void btrfs_remove_ordered_extent(struct btrfs_inode *btrfs_inode,

				struct btrfs_ordered_extent *entry);

void btrfs_mark_ordered_io_finished(struct btrfs_inode *inode,

				struct page *page, u64 file_offset,

				u64 num_bytes, btrfs_func_t finish_func,

				bool uptodate);

				u64 num_bytes, bool uptodate);

bool btrfs_dec_test_ordered_pending(struct btrfs_inode *inode,

				    struct btrfs_ordered_extent **cached,

				    u64 file_offset, u64 io_size);