diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-19 13:02:34 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-19 13:02:34 +0000 |
| commit | 236b11de51c7501c454ca125d84152b06ef7f27e (patch) | |
| tree | d0ca0b99961da2a8a46b4f86a57de8424dadce1d /drivers/md/bcache/request.c | |
| parent | 0f4cc282951a76011db1da6787b3d2acc63238ca (diff) | |
| parent | ba3e31f87e8b736adf01f1dc09cd5618966ee193 (diff) | |
| download | linux-236b11de51c7501c454ca125d84152b06ef7f27e.tar.gz linux-236b11de51c7501c454ca125d84152b06ef7f27e.tar.xz | |
Merge branch 'ib-mfd-regulator-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-s2mps11
Diffstat (limited to 'drivers/md/bcache/request.c')
| -rw-r--r-- | drivers/md/bcache/request.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index 72cd213f213f..5d5d031cf381 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c @@ -353,14 +353,14 @@ static void bch_data_insert_start(struct closure *cl) struct data_insert_op *op = container_of(cl, struct data_insert_op, cl); struct bio *bio = op->bio, *n; - if (op->bypass) - return bch_data_invalidate(cl); - if (atomic_sub_return(bio_sectors(bio), &op->c->sectors_to_gc) < 0) { set_gc_sectors(op->c); wake_up_gc(op->c); } + if (op->bypass) + return bch_data_invalidate(cl); + /* * Journal writes are marked REQ_FLUSH; if the original write was a * flush, it'll wait on the journal write. |