UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

btrfs: raid56: use new helper for async_read_rebuild 

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2018-06-29 10:57:00 +02:00
parent cf6a4a7587
commit e66d8d5a41
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/btrfs/raid56.c
View File

@ -162,7 +162,6 @@ static int __raid56_parity_recover(struct btrfs_raid_bio *rbio);
static noinline void finish_rmw(struct btrfs_raid_bio *rbio); static noinline void finish_rmw(struct btrfs_raid_bio *rbio);
static void rmw_work(struct btrfs_work *work); static void rmw_work(struct btrfs_work *work);
static void read_rebuild_work(struct btrfs_work *work); static void read_rebuild_work(struct btrfs_work *work);
static void async_read_rebuild(struct btrfs_raid_bio *rbio);
static int fail_bio_stripe(struct btrfs_raid_bio *rbio, struct bio *bio); static int fail_bio_stripe(struct btrfs_raid_bio *rbio, struct bio *bio);
static int fail_rbio_index(struct btrfs_raid_bio *rbio, int failed); static int fail_rbio_index(struct btrfs_raid_bio *rbio, int failed);
static void __free_raid_bio(struct btrfs_raid_bio *rbio); static void __free_raid_bio(struct btrfs_raid_bio *rbio);
@ -804,10 +803,10 @@ static noinline void unlock_stripe(struct btrfs_raid_bio *rbio)
spin_unlock_irqrestore(&h->lock, flags); spin_unlock_irqrestore(&h->lock, flags);
if (next->operation == BTRFS_RBIO_READ_REBUILD) if (next->operation == BTRFS_RBIO_READ_REBUILD)
async_read_rebuild(next); start_async_work(next, read_rebuild_work);
else if (next->operation == BTRFS_RBIO_REBUILD_MISSING) { else if (next->operation == BTRFS_RBIO_REBUILD_MISSING) {
steal_rbio(rbio, next); steal_rbio(rbio, next);
async_read_rebuild(next); start_async_work(next, read_rebuild_work);
} else if (next->operation == BTRFS_RBIO_WRITE) { } else if (next->operation == BTRFS_RBIO_WRITE) {
steal_rbio(rbio, next); steal_rbio(rbio, next);
start_async_work(next, rmw_work); start_async_work(next, rmw_work);
@ -1500,14 +1499,6 @@ cleanup:
rbio_orig_end_io(rbio, BLK_STS_IOERR); rbio_orig_end_io(rbio, BLK_STS_IOERR);
} }
static void async_read_rebuild(struct btrfs_raid_bio *rbio)
{
btrfs_init_work(&rbio->work, btrfs_rmw_helper,
read_rebuild_work, NULL, NULL);
btrfs_queue_work(rbio->fs_info->rmw_workers, &rbio->work);
}
/* /*
* the stripe must be locked by the caller. It will * the stripe must be locked by the caller. It will
* unlock after all the writes are done * unlock after all the writes are done
@ -2765,5 +2756,5 @@ raid56_alloc_missing_rbio(struct btrfs_fs_info *fs_info, struct bio *bio,
void raid56_submit_missing_rbio(struct btrfs_raid_bio *rbio) void raid56_submit_missing_rbio(struct btrfs_raid_bio *rbio)
{ {
if (!lock_stripe_add(rbio)) if (!lock_stripe_add(rbio))
async_read_rebuild(rbio); start_async_work(rbio, read_rebuild_work);
} }