From e99960531c1869e1cfdd2da992106dee29168f84 Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Fri, 23 Mar 2012 10:22:46 -0400 Subject: [PATCH] --- yaml --- r: 297852 b: refs/heads/master c: f3f266ab1bfe4770375d24fa8e72a03278e9450a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/disk-io.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1618c325e791..b7bbf77d3c98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7c79f30cb2d3883488e70cafc9e3a7edd4b9fdb +refs/heads/master: f3f266ab1bfe4770375d24fa8e72a03278e9450a diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c index c54aec87e89d..53c5ea702799 100644 --- a/trunk/fs/btrfs/disk-io.c +++ b/trunk/fs/btrfs/disk-io.c @@ -840,15 +840,15 @@ static int btree_submit_bio_hook(struct inode *inode, int rw, struct bio *bio, { int ret; - ret = btrfs_bio_wq_end_io(BTRFS_I(inode)->root->fs_info, - bio, 1); - BUG_ON(ret); - if (!(rw & REQ_WRITE)) { + /* * called for a read, do the setup so that checksum validation * can happen in the async kernel threads */ + ret = btrfs_bio_wq_end_io(BTRFS_I(inode)->root->fs_info, + bio, 1); + BUG_ON(ret); return btrfs_map_bio(BTRFS_I(inode)->root, rw, bio, mirror_num, 0); }