diff options
author | Chris Mason <chris.mason@oracle.com> | 2012-03-23 10:22:46 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2012-03-26 17:04:24 -0400 |
commit | f3f266ab1bfe4770375d24fa8e72a03278e9450a (patch) | |
tree | 7b3e7f79cad427e978230da6afa8d51a4aa6b58f /fs/btrfs/disk-io.c | |
parent | f7c79f30cb2d3883488e70cafc9e3a7edd4b9fdb (diff) |
Btrfs: don't use threaded IO completion helpers for metadata writes
The metadata write IO completion code is now simple enough that we
don't need the threaded helpers anymore.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r-- | fs/btrfs/disk-io.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index c54aec87e89d..53c5ea702799 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -840,15 +840,15 @@ static int btree_submit_bio_hook(struct inode *inode, int rw, struct bio *bio, | |||
840 | { | 840 | { |
841 | int ret; | 841 | int ret; |
842 | 842 | ||
843 | ret = btrfs_bio_wq_end_io(BTRFS_I(inode)->root->fs_info, | ||
844 | bio, 1); | ||
845 | BUG_ON(ret); | ||
846 | |||
847 | if (!(rw & REQ_WRITE)) { | 843 | if (!(rw & REQ_WRITE)) { |
844 | |||
848 | /* | 845 | /* |
849 | * called for a read, do the setup so that checksum validation | 846 | * called for a read, do the setup so that checksum validation |
850 | * can happen in the async kernel threads | 847 | * can happen in the async kernel threads |
851 | */ | 848 | */ |
849 | ret = btrfs_bio_wq_end_io(BTRFS_I(inode)->root->fs_info, | ||
850 | bio, 1); | ||
851 | BUG_ON(ret); | ||
852 | return btrfs_map_bio(BTRFS_I(inode)->root, rw, bio, | 852 | return btrfs_map_bio(BTRFS_I(inode)->root, rw, bio, |
853 | mirror_num, 0); | 853 | mirror_num, 0); |
854 | } | 854 | } |