diff options
| author |   Josef Bacik <josef@toxicpanda.com> | 2022-09-09 17:53:14 -0400 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2022-09-26 12:28:02 +0200 |
| commit | 0d0a762c419a98dcf40db20b7f2681d7b7191d46 (patch) | |
| tree | 4888f0c9fc447489f24c7ca184ba675a71016bf5 /fs/btrfs/inode.c | |
| parent | btrfs: add KCSAN annotations for unlocked access to block_rsv->full (diff) | |
| download | linux-dev-0d0a762c419a98dcf40db20b7f2681d7b7191d46.tar.xz linux-dev-0d0a762c419a98dcf40db20b7f2681d7b7191d46.zip | |
btrfs: rename clean_io_failure and remove extraneous args
This is exported, so rename it to btrfs_clean_io_failure. Additionally
we are passing in the io tree's and such from the inode, so instead of
doing all that simply pass in the inode itself and get all the
components we need directly inside of btrfs_clean_io_failure.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 10849db7f3a5..548665299e57 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -7869,8 +7869,6 @@ static blk_status_t btrfs_check_read_dio_bio(struct btrfs_dio_private *dip, { struct inode *inode = dip->inode; struct btrfs_fs_info *fs_info = BTRFS_I(inode)->root->fs_info; - struct extent_io_tree *failure_tree = &BTRFS_I(inode)->io_failure_tree; - struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree; const bool csum = !(BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM); blk_status_t err = BLK_STS_OK; struct bvec_iter iter; @@ -7883,9 +7881,8 @@ static blk_status_t btrfs_check_read_dio_bio(struct btrfs_dio_private *dip, if (uptodate && (!csum || !btrfs_check_data_csum(inode, bbio, offset, bv.bv_page, bv.bv_offset))) { - clean_io_failure(fs_info, failure_tree, io_tree, start, - bv.bv_page, btrfs_ino(BTRFS_I(inode)), - bv.bv_offset); + btrfs_clean_io_failure(BTRFS_I(inode), start, + bv.bv_page, bv.bv_offset); } else { int ret; |