diff options
| author | Omar Sandoval <osandov@fb.com> | 2020-04-16 14:46:24 -0700 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2020-05-25 11:25:27 +0200 |
| commit | 5c047a699aa9433ad92136343a9306d985134c24 (patch) | |
| tree | 6b50a96455fab869499f944b0f7d4cc4eecf013f /fs/btrfs/inode.c | |
| parent | fd9d6670edba68cedd87b3db04cbdcdfc492cc0a (diff) | |
| download | linux-5c047a699aa9433ad92136343a9306d985134c24.tar.bz2 | |
btrfs: get rid of endio_repair_workers
This was originally added in commit 8b110e393c5a ("Btrfs: implement
repair function when direct read fails") to avoid a deadlock. In that
commit, the direct I/O read endio executes on the endio_workers
workqueue, submits a repair bio, and waits for it to complete. The
repair bio endio must execute on a different workqueue, otherwise it
could block on the endio_workers workqueue becoming available, which
won't happen because the original endio is blocked on the repair bio.
As of the previous commit, the original endio doesn't wait for the
repair bio, so this separate workqueue is unnecessary.
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 1462f64c2c4b..bd7453f02a9d 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -7388,7 +7388,7 @@ static inline blk_status_t submit_dio_repair_bio(struct inode *inode, BUG_ON(bio_op(bio) == REQ_OP_WRITE); - ret = btrfs_bio_wq_end_io(fs_info, bio, BTRFS_WQ_ENDIO_DIO_REPAIR); + ret = btrfs_bio_wq_end_io(fs_info, bio, BTRFS_WQ_ENDIO_DATA); if (ret) return ret; |