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

btrfs: switch btrfs_ordered_extent::inode to struct btrfs_inode 



The structure is internal so we should use struct btrfs_inode for that,
allowing to remove some use of BTRFS_I.

Reviewed-by: default avatarBoris Burkov <boris@bur.io>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent c154a844

fs/btrfs/compression.c

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ void btrfs_submit_compressed_write(struct btrfs_ordered_extent *ordered, 
				   blk_opf_t write_flags,

				   bool writeback)

{

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

	struct btrfs_inode *inode = ordered->inode;

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	struct compressed_bio *cb;

fs/btrfs/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -3037,7 +3037,7 @@ static int insert_ordered_extent_file_extent(struct btrfs_trans_handle *trans, 
			     test_bit(BTRFS_ORDERED_ENCODED, &oe->flags) ||

			     test_bit(BTRFS_ORDERED_TRUNCATED, &oe->flags);



	return insert_reserved_file_extent(trans, BTRFS_I(oe->inode),

	return insert_reserved_file_extent(trans, oe->inode,

					   oe->file_offset, &stack_fi,

					   update_inode_bytes, oe->qgroup_rsv);

}
@@ -3049,7 +3049,7 @@ static int insert_ordered_extent_file_extent(struct btrfs_trans_handle *trans, 
 */

int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent)

{

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

	struct btrfs_inode *inode = ordered_extent->inode;

	struct btrfs_root *root = inode->root;

	struct btrfs_fs_info *fs_info = root->fs_info;

	struct btrfs_trans_handle *trans = NULL;
@@ -3283,7 +3283,7 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent) 


int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered)

{

	if (btrfs_is_zoned(inode_to_fs_info(ordered->inode)) &&

	if (btrfs_is_zoned(ordered->inode->root->fs_info) &&

	    !test_bit(BTRFS_ORDERED_IOERR, &ordered->flags) &&

	    list_empty(&ordered->bioc_list))

		btrfs_finish_ordered_zoned(ordered);

fs/btrfs/ordered-data.c

+11 −11
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static struct btrfs_ordered_extent *alloc_ordered_extent( 
	entry->disk_num_bytes = disk_num_bytes;

	entry->offset = offset;

	entry->bytes_left = num_bytes;

	entry->inode = igrab(&inode->vfs_inode);

	entry->inode = BTRFS_I(igrab(&inode->vfs_inode));

	entry->compress_type = compress_type;

	entry->truncated_len = (u64)-1;

	entry->qgroup_rsv = qgroup_rsv;
@@ -208,7 +208,7 @@ static struct btrfs_ordered_extent *alloc_ordered_extent( 


static void insert_ordered_extent(struct btrfs_ordered_extent *entry)

{

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

	struct btrfs_inode *inode = entry->inode;

	struct btrfs_root *root = inode->root;

	struct btrfs_fs_info *fs_info = root->fs_info;

	struct rb_node *node;
@@ -310,7 +310,7 @@ struct btrfs_ordered_extent *btrfs_alloc_ordered_extent( 
void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry,

			   struct btrfs_ordered_sum *sum)

{

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

	struct btrfs_inode *inode = entry->inode;



	spin_lock_irq(&inode->ordered_tree_lock);

	list_add_tail(&sum->list, &entry->list);
@@ -320,7 +320,7 @@ void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry, 
void btrfs_mark_ordered_extent_error(struct btrfs_ordered_extent *ordered)

{

	if (!test_and_set_bit(BTRFS_ORDERED_IOERR, &ordered->flags))

		mapping_set_error(ordered->inode->i_mapping, -EIO);

		mapping_set_error(ordered->inode->vfs_inode.i_mapping, -EIO);

}



static void finish_ordered_fn(struct btrfs_work *work)
@@ -335,7 +335,7 @@ static bool can_finish_ordered_extent(struct btrfs_ordered_extent *ordered, 
				      struct page *page, u64 file_offset,

				      u64 len, bool uptodate)

{

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

	struct btrfs_inode *inode = ordered->inode;

	struct btrfs_fs_info *fs_info = inode->root->fs_info;



	lockdep_assert_held(&inode->ordered_tree_lock);
@@ -388,7 +388,7 @@ static bool can_finish_ordered_extent(struct btrfs_ordered_extent *ordered, 


static void btrfs_queue_ordered_fn(struct btrfs_ordered_extent *ordered)

{

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

	struct btrfs_inode *inode = ordered->inode;

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	struct btrfs_workqueue *wq = btrfs_is_free_space_inode(inode) ?

		fs_info->endio_freespace_worker : fs_info->endio_write_workers;
@@ -401,7 +401,7 @@ void btrfs_finish_ordered_extent(struct btrfs_ordered_extent *ordered, 
				 struct page *page, u64 file_offset, u64 len,

				 bool uptodate)

{

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

	struct btrfs_inode *inode = ordered->inode;

	unsigned long flags;

	bool ret;
@@ -610,14 +610,14 @@ void btrfs_put_ordered_extent(struct btrfs_ordered_extent *entry) 
	struct list_head *cur;

	struct btrfs_ordered_sum *sum;



	trace_btrfs_ordered_extent_put(BTRFS_I(entry->inode), entry);

	trace_btrfs_ordered_extent_put(entry->inode, entry);



	if (refcount_dec_and_test(&entry->refs)) {

		ASSERT(list_empty(&entry->root_extent_list));

		ASSERT(list_empty(&entry->log_list));

		ASSERT(RB_EMPTY_NODE(&entry->rb_node));

		if (entry->inode)

			btrfs_add_delayed_iput(BTRFS_I(entry->inode));

			btrfs_add_delayed_iput(entry->inode);

		while (!list_empty(&entry->list)) {

			cur = entry->list.next;

			sum = list_entry(cur, struct btrfs_ordered_sum, list);
@@ -849,7 +849,7 @@ void btrfs_start_ordered_extent(struct btrfs_ordered_extent *entry) 
{

	u64 start = entry->file_offset;

	u64 end = start + entry->num_bytes - 1;

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

	struct btrfs_inode *inode = entry->inode;

	bool freespace_inode;



	trace_btrfs_ordered_extent_start(inode, entry);
@@ -1208,7 +1208,7 @@ bool btrfs_try_lock_ordered_range(struct btrfs_inode *inode, u64 start, u64 end, 
struct btrfs_ordered_extent *btrfs_split_ordered_extent(

			struct btrfs_ordered_extent *ordered, u64 len)

{

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

	struct btrfs_inode *inode = ordered->inode;

	struct btrfs_root *root = inode->root;

	struct btrfs_fs_info *fs_info = root->fs_info;

	u64 file_offset = ordered->file_offset;

fs/btrfs/ordered-data.h

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ struct btrfs_ordered_extent { 
	refcount_t refs;



	/* the inode we belong to */

	struct inode *inode;

	struct btrfs_inode *inode;



	/* list of checksums for insertion when the extent io is done */

	struct list_head list;

fs/btrfs/relocation.c

+1 −1
Original line number Diff line number Diff line
@@ -4388,7 +4388,7 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info) 
 */

int btrfs_reloc_clone_csums(struct btrfs_ordered_extent *ordered)

{

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

	struct btrfs_inode *inode = ordered->inode;

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	u64 disk_bytenr = ordered->file_offset + inode->reloc_block_group_start;

	struct btrfs_root *csum_root = btrfs_csum_root(fs_info, disk_bytenr);