diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-10-17 05:38:15 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-10-17 05:38:14 -0700 |
| commit | f2b5c20a20626247665b913b6ec6cb37de0bfa89 (patch) | |
| tree | 3e214059d460cbd3861557c3b43a567d49632785 /drivers/md/bcache/request.c | |
| parent | 6d08baec3167417c0950132dc231a7ae8e2bc283 (diff) | |
| parent | fda1654df897b537f5d33bda92ef7435b68c606f (diff) | |
Merge "Merge android-4.4@d68ba9f (v4.4.89) into msm-4.4"
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 2410df1c2a05..6c4c7caea693 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c @@ -196,12 +196,12 @@ 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 (atomic_sub_return(bio_sectors(bio), &op->c->sectors_to_gc) < 0) - wake_up_gc(op->c); - if (op->bypass) return bch_data_invalidate(cl); + if (atomic_sub_return(bio_sectors(bio), &op->c->sectors_to_gc) < 0) + wake_up_gc(op->c); + /* * Journal writes are marked REQ_FLUSH; if the original write was a * flush, it'll wait on the journal write. |