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: Boris Burkov <boris@bur.io>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 07b31d1c09267c2574594073bcb47ba3cea47452..de136ef3a2f8146b5bbe91e9b1a5b101ad1f03b9 100644 (file)
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -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;
 

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index dfbb907430262e94ca82e3344d548adb89a01e8d..510a12e03a051680d6617b6042e6e485b28400a9 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -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 @@ out:
 
 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);

diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index a3343656e0a7364c79ba482cb44d71990d4b07a2..82a68394a89c0672c67450ab1d7aaafcfdc54755 100644 (file)
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -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;

diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h
index 4aabdff409fae8d25b5ecca7d780366bfdc9c4b7..51b9e81726e220deb20ab76609146c7a81fc428e 100644 (file)
--- a/fs/btrfs/ordered-data.h
+++ b/fs/btrfs/ordered-data.h
@@ -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;

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 6ea407255a30b8a38b0b76942d7a0a5543ac8a7e..1a28ec054991b2e6eda6566481b9c1a4f69b726b 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -4388,7 +4388,7 @@ out:
  */
 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);

diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
index 8a99f5187e3043568450be84f9b7fba3494f4a36..58e724c80a0634d8e88ad3c5400e5c436d578b6d 100644 (file)
--- a/fs/btrfs/zoned.c
+++ b/fs/btrfs/zoned.c
@@ -1765,7 +1765,7 @@ void btrfs_record_physical_zoned(struct btrfs_bio *bbio)
 static void btrfs_rewrite_logical_zoned(struct btrfs_ordered_extent *ordered,
                                        u64 logical)
 {
-       struct extent_map_tree *em_tree = &BTRFS_I(ordered->inode)->extent_tree;
+       struct extent_map_tree *em_tree = &ordered->inode->extent_tree;
        struct extent_map *em;
 
        ordered->disk_bytenr = logical;
@@ -1786,7 +1786,7 @@ static bool btrfs_zoned_split_ordered(struct btrfs_ordered_extent *ordered,
        struct btrfs_ordered_extent *new;
 
        if (!test_bit(BTRFS_ORDERED_NOCOW, &ordered->flags) &&
-           split_extent_map(BTRFS_I(ordered->inode), ordered->file_offset,
+           split_extent_map(ordered->inode, ordered->file_offset,
                             ordered->num_bytes, len, logical))
                return false;
 
@@ -1800,7 +1800,7 @@ static bool btrfs_zoned_split_ordered(struct btrfs_ordered_extent *ordered,
 
 void btrfs_finish_ordered_zoned(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_ordered_sum *sum;
        u64 logical, len;