mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
btrfs: merge btrfs_submit_bio_done to its caller
There's one caller and its code is simple, we can open code it in run_one_async_done. The errors are passed through bio. Reviewed-by: Nikolay Borisov <nborisov@suse.com> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
7333bd02dc
commit
06ea01b1ee
2 changed files with 17 additions and 24 deletions
|
@ -764,11 +764,22 @@ static void run_one_async_start(struct btrfs_work *work)
|
||||||
async->status = ret;
|
async->status = ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* In order to insert checksums into the metadata in large chunks, we wait
|
||||||
|
* until bio submission time. All the pages in the bio are checksummed and
|
||||||
|
* sums are attached onto the ordered extent record.
|
||||||
|
*
|
||||||
|
* At IO completion time the csums attached on the ordered extent record are
|
||||||
|
* inserted into the tree.
|
||||||
|
*/
|
||||||
static void run_one_async_done(struct btrfs_work *work)
|
static void run_one_async_done(struct btrfs_work *work)
|
||||||
{
|
{
|
||||||
struct async_submit_bio *async;
|
struct async_submit_bio *async;
|
||||||
|
struct inode *inode;
|
||||||
|
blk_status_t ret;
|
||||||
|
|
||||||
async = container_of(work, struct async_submit_bio, work);
|
async = container_of(work, struct async_submit_bio, work);
|
||||||
|
inode = async->private_data;
|
||||||
|
|
||||||
/* If an error occurred we just want to clean up the bio and move on */
|
/* If an error occurred we just want to clean up the bio and move on */
|
||||||
if (async->status) {
|
if (async->status) {
|
||||||
|
@ -777,7 +788,12 @@ static void run_one_async_done(struct btrfs_work *work)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
btrfs_submit_bio_done(async->private_data, async->bio, async->mirror_num);
|
ret = btrfs_map_bio(btrfs_sb(inode->i_sb), async->bio,
|
||||||
|
async->mirror_num, 1);
|
||||||
|
if (ret) {
|
||||||
|
async->bio->bi_status = ret;
|
||||||
|
bio_endio(async->bio);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void run_one_async_free(struct btrfs_work *work)
|
static void run_one_async_free(struct btrfs_work *work)
|
||||||
|
|
|
@ -1924,29 +1924,6 @@ static blk_status_t btrfs_submit_bio_start(void *private_data, struct bio *bio,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* in order to insert checksums into the metadata in large chunks,
|
|
||||||
* we wait until bio submission time. All the pages in the bio are
|
|
||||||
* checksummed and sums are attached onto the ordered extent record.
|
|
||||||
*
|
|
||||||
* At IO completion time the cums attached on the ordered extent record
|
|
||||||
* are inserted into the btree
|
|
||||||
*/
|
|
||||||
blk_status_t btrfs_submit_bio_done(void *private_data, struct bio *bio,
|
|
||||||
int mirror_num)
|
|
||||||
{
|
|
||||||
struct inode *inode = private_data;
|
|
||||||
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
|
|
||||||
blk_status_t ret;
|
|
||||||
|
|
||||||
ret = btrfs_map_bio(fs_info, bio, mirror_num, 1);
|
|
||||||
if (ret) {
|
|
||||||
bio->bi_status = ret;
|
|
||||||
bio_endio(bio);
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* extent_io.c submission hook. This does the right thing for csum calculation
|
* extent_io.c submission hook. This does the right thing for csum calculation
|
||||||
* on write, or reading the csums from the tree before a read.
|
* on write, or reading the csums from the tree before a read.
|
||||||
|
|
Loading…
Reference in a new issue