Skip to content

Commit a1f4e3d

Browse files
committed
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 <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent c154a84 commit a1f4e3d

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

fs/btrfs/compression.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ void btrfs_submit_compressed_write(struct btrfs_ordered_extent *ordered,
374374
blk_opf_t write_flags,
375375
bool writeback)
376376
{
377-
struct btrfs_inode *inode = BTRFS_I(ordered->inode);
377+
struct btrfs_inode *inode = ordered->inode;
378378
struct btrfs_fs_info *fs_info = inode->root->fs_info;
379379
struct compressed_bio *cb;
380380

fs/btrfs/inode.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3037,7 +3037,7 @@ static int insert_ordered_extent_file_extent(struct btrfs_trans_handle *trans,
30373037
test_bit(BTRFS_ORDERED_ENCODED, &oe->flags) ||
30383038
test_bit(BTRFS_ORDERED_TRUNCATED, &oe->flags);
30393039

3040-
return insert_reserved_file_extent(trans, BTRFS_I(oe->inode),
3040+
return insert_reserved_file_extent(trans, oe->inode,
30413041
oe->file_offset, &stack_fi,
30423042
update_inode_bytes, oe->qgroup_rsv);
30433043
}
@@ -3049,7 +3049,7 @@ static int insert_ordered_extent_file_extent(struct btrfs_trans_handle *trans,
30493049
*/
30503050
int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent)
30513051
{
3052-
struct btrfs_inode *inode = BTRFS_I(ordered_extent->inode);
3052+
struct btrfs_inode *inode = ordered_extent->inode;
30533053
struct btrfs_root *root = inode->root;
30543054
struct btrfs_fs_info *fs_info = root->fs_info;
30553055
struct btrfs_trans_handle *trans = NULL;
@@ -3283,7 +3283,7 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent)
32833283

32843284
int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered)
32853285
{
3286-
if (btrfs_is_zoned(inode_to_fs_info(ordered->inode)) &&
3286+
if (btrfs_is_zoned(ordered->inode->root->fs_info) &&
32873287
!test_bit(BTRFS_ORDERED_IOERR, &ordered->flags) &&
32883288
list_empty(&ordered->bioc_list))
32893289
btrfs_finish_ordered_zoned(ordered);

fs/btrfs/ordered-data.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ static struct btrfs_ordered_extent *alloc_ordered_extent(
180180
entry->disk_num_bytes = disk_num_bytes;
181181
entry->offset = offset;
182182
entry->bytes_left = num_bytes;
183-
entry->inode = igrab(&inode->vfs_inode);
183+
entry->inode = BTRFS_I(igrab(&inode->vfs_inode));
184184
entry->compress_type = compress_type;
185185
entry->truncated_len = (u64)-1;
186186
entry->qgroup_rsv = qgroup_rsv;
@@ -208,7 +208,7 @@ static struct btrfs_ordered_extent *alloc_ordered_extent(
208208

209209
static void insert_ordered_extent(struct btrfs_ordered_extent *entry)
210210
{
211-
struct btrfs_inode *inode = BTRFS_I(entry->inode);
211+
struct btrfs_inode *inode = entry->inode;
212212
struct btrfs_root *root = inode->root;
213213
struct btrfs_fs_info *fs_info = root->fs_info;
214214
struct rb_node *node;
@@ -310,7 +310,7 @@ struct btrfs_ordered_extent *btrfs_alloc_ordered_extent(
310310
void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry,
311311
struct btrfs_ordered_sum *sum)
312312
{
313-
struct btrfs_inode *inode = BTRFS_I(entry->inode);
313+
struct btrfs_inode *inode = entry->inode;
314314

315315
spin_lock_irq(&inode->ordered_tree_lock);
316316
list_add_tail(&sum->list, &entry->list);
@@ -320,7 +320,7 @@ void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry,
320320
void btrfs_mark_ordered_extent_error(struct btrfs_ordered_extent *ordered)
321321
{
322322
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);
324324
}
325325

326326
static void finish_ordered_fn(struct btrfs_work *work)
@@ -335,7 +335,7 @@ static bool can_finish_ordered_extent(struct btrfs_ordered_extent *ordered,
335335
struct page *page, u64 file_offset,
336336
u64 len, bool uptodate)
337337
{
338-
struct btrfs_inode *inode = BTRFS_I(ordered->inode);
338+
struct btrfs_inode *inode = ordered->inode;
339339
struct btrfs_fs_info *fs_info = inode->root->fs_info;
340340

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

389389
static void btrfs_queue_ordered_fn(struct btrfs_ordered_extent *ordered)
390390
{
391-
struct btrfs_inode *inode = BTRFS_I(ordered->inode);
391+
struct btrfs_inode *inode = ordered->inode;
392392
struct btrfs_fs_info *fs_info = inode->root->fs_info;
393393
struct btrfs_workqueue *wq = btrfs_is_free_space_inode(inode) ?
394394
fs_info->endio_freespace_worker : fs_info->endio_write_workers;
@@ -401,7 +401,7 @@ void btrfs_finish_ordered_extent(struct btrfs_ordered_extent *ordered,
401401
struct page *page, u64 file_offset, u64 len,
402402
bool uptodate)
403403
{
404-
struct btrfs_inode *inode = BTRFS_I(ordered->inode);
404+
struct btrfs_inode *inode = ordered->inode;
405405
unsigned long flags;
406406
bool ret;
407407

@@ -610,14 +610,14 @@ void btrfs_put_ordered_extent(struct btrfs_ordered_extent *entry)
610610
struct list_head *cur;
611611
struct btrfs_ordered_sum *sum;
612612

613-
trace_btrfs_ordered_extent_put(BTRFS_I(entry->inode), entry);
613+
trace_btrfs_ordered_extent_put(entry->inode, entry);
614614

615615
if (refcount_dec_and_test(&entry->refs)) {
616616
ASSERT(list_empty(&entry->root_extent_list));
617617
ASSERT(list_empty(&entry->log_list));
618618
ASSERT(RB_EMPTY_NODE(&entry->rb_node));
619619
if (entry->inode)
620-
btrfs_add_delayed_iput(BTRFS_I(entry->inode));
620+
btrfs_add_delayed_iput(entry->inode);
621621
while (!list_empty(&entry->list)) {
622622
cur = entry->list.next;
623623
sum = list_entry(cur, struct btrfs_ordered_sum, list);
@@ -849,7 +849,7 @@ void btrfs_start_ordered_extent(struct btrfs_ordered_extent *entry)
849849
{
850850
u64 start = entry->file_offset;
851851
u64 end = start + entry->num_bytes - 1;
852-
struct btrfs_inode *inode = BTRFS_I(entry->inode);
852+
struct btrfs_inode *inode = entry->inode;
853853
bool freespace_inode;
854854

855855
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,
12081208
struct btrfs_ordered_extent *btrfs_split_ordered_extent(
12091209
struct btrfs_ordered_extent *ordered, u64 len)
12101210
{
1211-
struct btrfs_inode *inode = BTRFS_I(ordered->inode);
1211+
struct btrfs_inode *inode = ordered->inode;
12121212
struct btrfs_root *root = inode->root;
12131213
struct btrfs_fs_info *fs_info = root->fs_info;
12141214
u64 file_offset = ordered->file_offset;

fs/btrfs/ordered-data.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ struct btrfs_ordered_extent {
130130
refcount_t refs;
131131

132132
/* the inode we belong to */
133-
struct inode *inode;
133+
struct btrfs_inode *inode;
134134

135135
/* list of checksums for insertion when the extent io is done */
136136
struct list_head list;

fs/btrfs/relocation.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4388,7 +4388,7 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info)
43884388
*/
43894389
int btrfs_reloc_clone_csums(struct btrfs_ordered_extent *ordered)
43904390
{
4391-
struct btrfs_inode *inode = BTRFS_I(ordered->inode);
4391+
struct btrfs_inode *inode = ordered->inode;
43924392
struct btrfs_fs_info *fs_info = inode->root->fs_info;
43934393
u64 disk_bytenr = ordered->file_offset + inode->reloc_block_group_start;
43944394
struct btrfs_root *csum_root = btrfs_csum_root(fs_info, disk_bytenr);

fs/btrfs/zoned.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1765,7 +1765,7 @@ void btrfs_record_physical_zoned(struct btrfs_bio *bbio)
17651765
static void btrfs_rewrite_logical_zoned(struct btrfs_ordered_extent *ordered,
17661766
u64 logical)
17671767
{
1768-
struct extent_map_tree *em_tree = &BTRFS_I(ordered->inode)->extent_tree;
1768+
struct extent_map_tree *em_tree = &ordered->inode->extent_tree;
17691769
struct extent_map *em;
17701770

17711771
ordered->disk_bytenr = logical;
@@ -1786,7 +1786,7 @@ static bool btrfs_zoned_split_ordered(struct btrfs_ordered_extent *ordered,
17861786
struct btrfs_ordered_extent *new;
17871787

17881788
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,
17901790
ordered->num_bytes, len, logical))
17911791
return false;
17921792

@@ -1800,7 +1800,7 @@ static bool btrfs_zoned_split_ordered(struct btrfs_ordered_extent *ordered,
18001800

18011801
void btrfs_finish_ordered_zoned(struct btrfs_ordered_extent *ordered)
18021802
{
1803-
struct btrfs_inode *inode = BTRFS_I(ordered->inode);
1803+
struct btrfs_inode *inode = ordered->inode;
18041804
struct btrfs_fs_info *fs_info = inode->root->fs_info;
18051805
struct btrfs_ordered_sum *sum;
18061806
u64 logical, len;

0 commit comments

Comments
 (0)