Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+20 -20
+1 -1
fs/btrfs/compression.c
··· 374 374 blk_opf_t write_flags, 375 375 bool writeback) 376 376 { 377 - struct btrfs_inode *inode = BTRFS_I(ordered->inode); 377 + struct btrfs_inode *inode = ordered->inode; 378 378 struct btrfs_fs_info *fs_info = inode->root->fs_info; 379 379 struct compressed_bio *cb; 380 380
+3 -3
fs/btrfs/inode.c
··· 3037 3037 test_bit(BTRFS_ORDERED_ENCODED, &oe->flags) || 3038 3038 test_bit(BTRFS_ORDERED_TRUNCATED, &oe->flags); 3039 3039 3040 - return insert_reserved_file_extent(trans, BTRFS_I(oe->inode), 3040 + return insert_reserved_file_extent(trans, oe->inode, 3041 3041 oe->file_offset, &stack_fi, 3042 3042 update_inode_bytes, oe->qgroup_rsv); 3043 3043 } ··· 3049 3049 */ 3050 3050 int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent) 3051 3051 { 3052 - struct btrfs_inode *inode = BTRFS_I(ordered_extent->inode); 3052 + struct btrfs_inode *inode = ordered_extent->inode; 3053 3053 struct btrfs_root *root = inode->root; 3054 3054 struct btrfs_fs_info *fs_info = root->fs_info; 3055 3055 struct btrfs_trans_handle *trans = NULL; ··· 3283 3283 3284 3284 int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered) 3285 3285 { 3286 - if (btrfs_is_zoned(inode_to_fs_info(ordered->inode)) && 3286 + if (btrfs_is_zoned(ordered->inode->root->fs_info) && 3287 3287 !test_bit(BTRFS_ORDERED_IOERR, &ordered->flags) && 3288 3288 list_empty(&ordered->bioc_list)) 3289 3289 btrfs_finish_ordered_zoned(ordered);
+11 -11
fs/btrfs/ordered-data.c
··· 180 180 entry->disk_num_bytes = disk_num_bytes; 181 181 entry->offset = offset; 182 182 entry->bytes_left = num_bytes; 183 - entry->inode = igrab(&inode->vfs_inode); 183 + entry->inode = BTRFS_I(igrab(&inode->vfs_inode)); 184 184 entry->compress_type = compress_type; 185 185 entry->truncated_len = (u64)-1; 186 186 entry->qgroup_rsv = qgroup_rsv; ··· 208 208 209 209 static void insert_ordered_extent(struct btrfs_ordered_extent *entry) 210 210 { 211 - struct btrfs_inode *inode = BTRFS_I(entry->inode); 211 + struct btrfs_inode *inode = entry->inode; 212 212 struct btrfs_root *root = inode->root; 213 213 struct btrfs_fs_info *fs_info = root->fs_info; 214 214 struct rb_node *node; ··· 310 310 void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry, 311 311 struct btrfs_ordered_sum *sum) 312 312 { 313 - struct btrfs_inode *inode = BTRFS_I(entry->inode); 313 + struct btrfs_inode *inode = entry->inode; 314 314 315 315 spin_lock_irq(&inode->ordered_tree_lock); 316 316 list_add_tail(&sum->list, &entry->list); ··· 320 320 void btrfs_mark_ordered_extent_error(struct btrfs_ordered_extent *ordered) 321 321 { 322 322 if (!test_and_set_bit(BTRFS_ORDERED_IOERR, &ordered->flags)) 323 - mapping_set_error(ordered->inode->i_mapping, -EIO); 323 + mapping_set_error(ordered->inode->vfs_inode.i_mapping, -EIO); 324 324 } 325 325 326 326 static void finish_ordered_fn(struct btrfs_work *work) ··· 335 335 struct page *page, u64 file_offset, 336 336 u64 len, bool uptodate) 337 337 { 338 - struct btrfs_inode *inode = BTRFS_I(ordered->inode); 338 + struct btrfs_inode *inode = ordered->inode; 339 339 struct btrfs_fs_info *fs_info = inode->root->fs_info; 340 340 341 341 lockdep_assert_held(&inode->ordered_tree_lock); ··· 388 388 389 389 static void btrfs_queue_ordered_fn(struct btrfs_ordered_extent *ordered) 390 390 { 391 - struct btrfs_inode *inode = BTRFS_I(ordered->inode); 391 + struct btrfs_inode *inode = ordered->inode; 392 392 struct btrfs_fs_info *fs_info = inode->root->fs_info; 393 393 struct btrfs_workqueue *wq = btrfs_is_free_space_inode(inode) ? 394 394 fs_info->endio_freespace_worker : fs_info->endio_write_workers; ··· 401 401 struct page *page, u64 file_offset, u64 len, 402 402 bool uptodate) 403 403 { 404 - struct btrfs_inode *inode = BTRFS_I(ordered->inode); 404 + struct btrfs_inode *inode = ordered->inode; 405 405 unsigned long flags; 406 406 bool ret; 407 407 ··· 610 610 struct list_head *cur; 611 611 struct btrfs_ordered_sum *sum; 612 612 613 - trace_btrfs_ordered_extent_put(BTRFS_I(entry->inode), entry); 613 + trace_btrfs_ordered_extent_put(entry->inode, entry); 614 614 615 615 if (refcount_dec_and_test(&entry->refs)) { 616 616 ASSERT(list_empty(&entry->root_extent_list)); 617 617 ASSERT(list_empty(&entry->log_list)); 618 618 ASSERT(RB_EMPTY_NODE(&entry->rb_node)); 619 619 if (entry->inode) 620 - btrfs_add_delayed_iput(BTRFS_I(entry->inode)); 620 + btrfs_add_delayed_iput(entry->inode); 621 621 while (!list_empty(&entry->list)) { 622 622 cur = entry->list.next; 623 623 sum = list_entry(cur, struct btrfs_ordered_sum, list); ··· 849 849 { 850 850 u64 start = entry->file_offset; 851 851 u64 end = start + entry->num_bytes - 1; 852 - struct btrfs_inode *inode = BTRFS_I(entry->inode); 852 + struct btrfs_inode *inode = entry->inode; 853 853 bool freespace_inode; 854 854 855 855 trace_btrfs_ordered_extent_start(inode, entry); ··· 1208 1208 struct btrfs_ordered_extent *btrfs_split_ordered_extent( 1209 1209 struct btrfs_ordered_extent *ordered, u64 len) 1210 1210 { 1211 - struct btrfs_inode *inode = BTRFS_I(ordered->inode); 1211 + struct btrfs_inode *inode = ordered->inode; 1212 1212 struct btrfs_root *root = inode->root; 1213 1213 struct btrfs_fs_info *fs_info = root->fs_info; 1214 1214 u64 file_offset = ordered->file_offset;
+1 -1
fs/btrfs/ordered-data.h
··· 130 130 refcount_t refs; 131 131 132 132 /* the inode we belong to */ 133 - struct inode *inode; 133 + struct btrfs_inode *inode; 134 134 135 135 /* list of checksums for insertion when the extent io is done */ 136 136 struct list_head list;
+1 -1
fs/btrfs/relocation.c
··· 4388 4388 */ 4389 4389 int btrfs_reloc_clone_csums(struct btrfs_ordered_extent *ordered) 4390 4390 { 4391 - struct btrfs_inode *inode = BTRFS_I(ordered->inode); 4391 + struct btrfs_inode *inode = ordered->inode; 4392 4392 struct btrfs_fs_info *fs_info = inode->root->fs_info; 4393 4393 u64 disk_bytenr = ordered->file_offset + inode->reloc_block_group_start; 4394 4394 struct btrfs_root *csum_root = btrfs_csum_root(fs_info, disk_bytenr);
+3 -3
fs/btrfs/zoned.c
··· 1765 1765 static void btrfs_rewrite_logical_zoned(struct btrfs_ordered_extent *ordered, 1766 1766 u64 logical) 1767 1767 { 1768 - struct extent_map_tree *em_tree = &BTRFS_I(ordered->inode)->extent_tree; 1768 + struct extent_map_tree *em_tree = &ordered->inode->extent_tree; 1769 1769 struct extent_map *em; 1770 1770 1771 1771 ordered->disk_bytenr = logical; ··· 1786 1786 struct btrfs_ordered_extent *new; 1787 1787 1788 1788 if (!test_bit(BTRFS_ORDERED_NOCOW, &ordered->flags) && 1789 - split_extent_map(BTRFS_I(ordered->inode), ordered->file_offset, 1789 + split_extent_map(ordered->inode, ordered->file_offset, 1790 1790 ordered->num_bytes, len, logical)) 1791 1791 return false; 1792 1792 ··· 1800 1800 1801 1801 void btrfs_finish_ordered_zoned(struct btrfs_ordered_extent *ordered) 1802 1802 { 1803 - struct btrfs_inode *inode = BTRFS_I(ordered->inode); 1803 + struct btrfs_inode *inode = ordered->inode; 1804 1804 struct btrfs_fs_info *fs_info = inode->root->fs_info; 1805 1805 struct btrfs_ordered_sum *sum; 1806 1806 u64 logical, len;