btrfs: pass btrfs_inode to btrfs_submit_dio_repair_bio
authorDavid Sterba <dsterba@suse.com>
Thu, 27 Oct 2022 00:41:32 +0000 (02:41 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 5 Dec 2022 17:00:52 +0000 (18:00 +0100)
The function is for internal interfaces so we should use the
btrfs_inode.

Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/btrfs_inode.h
fs/btrfs/extent_io.c
fs/btrfs/inode.c

index 5406a2f817b20a4c2923ac03d591b65c3f75a99c..9fe1a11a2eb37af31ed882f1ca424ae7b39fe064 100644 (file)
@@ -414,7 +414,7 @@ static inline void btrfs_inode_split_flags(u64 inode_item_flags,
 void btrfs_submit_data_write_bio(struct btrfs_inode *inode, struct bio *bio, int mirror_num);
 void btrfs_submit_data_read_bio(struct btrfs_inode *inode, struct bio *bio,
                        int mirror_num, enum btrfs_compression_type compress_type);
-void btrfs_submit_dio_repair_bio(struct inode *inode, struct bio *bio, int mirror_num);
+void btrfs_submit_dio_repair_bio(struct btrfs_inode *inode, struct bio *bio, int mirror_num);
 blk_status_t btrfs_submit_bio_start(struct btrfs_inode *inode, struct bio *bio);
 blk_status_t btrfs_submit_bio_start_direct_io(struct btrfs_inode *inode,
                                              struct bio *bio,
index ac69e5f1605ce2aafad1524e9d4730e0790c3788..bddda397e438df68ca2663ab57e334b9c4788d22 100644 (file)
@@ -864,7 +864,8 @@ int btrfs_repair_one_sector(struct inode *inode, struct btrfs_bio *failed_bbio,
                btrfs_submit_data_read_bio(BTRFS_I(inode), repair_bio,
                                           failrec->this_mirror, 0);
        else
-               btrfs_submit_dio_repair_bio(inode, repair_bio, failrec->this_mirror);
+               btrfs_submit_dio_repair_bio(BTRFS_I(inode), repair_bio,
+                                           failrec->this_mirror);
 
        return BLK_STS_OK;
 }
index e3bbd19edea35fad903ad56f1a7df1ceb0719175..f0b4f3a9245fdc1856f2a9a1f72a3f368f9fa734 100644 (file)
@@ -7920,15 +7920,14 @@ static void btrfs_dio_private_put(struct btrfs_dio_private *dip)
        bio_endio(&dip->bio);
 }
 
-void btrfs_submit_dio_repair_bio(struct inode *inode, struct bio *bio, int mirror_num)
+void btrfs_submit_dio_repair_bio(struct btrfs_inode *inode, struct bio *bio, int mirror_num)
 {
        struct btrfs_dio_private *dip = btrfs_bio(bio)->private;
-       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
 
        BUG_ON(bio_op(bio) == REQ_OP_WRITE);
 
        refcount_inc(&dip->refs);
-       btrfs_submit_bio(fs_info, bio, mirror_num);
+       btrfs_submit_bio(inode->root->fs_info, bio, mirror_num);
 }
 
 static blk_status_t btrfs_check_read_dio_bio(struct btrfs_dio_private *dip,