Merge branch 'bcache-for-3.14' of git://evilpiepirate.org/~kent/linux-bcache into...

diff --combined drivers/md/bcache/request.c
index 72cd213f213f9e806dc9a0360000ffffe6466896,675229b93718c9a16df5cae58cf8fb85a3aadbb8..5d5d031cf3813247adb89653f2fe5fcd227ce764
--- 1/drivers/md/bcache/request.c
--- 2/drivers/md/bcache/request.c
+++ b/drivers/md/bcache/request.c
@@@ -163,6 -163,7 +163,6 @@@ static struct cgroup_subsys_state *bcac
  static void bcachecg_destroy(struct cgroup *cgroup)
  {
        struct bch_cgroup *cg = cgroup_to_bcache(cgroup);
 -      free_css_id(&bcache_subsys, &cg->css);
        kfree(cg);
  }
  
@@@ -353,14 -354,14 +353,14 @@@ static void bch_data_insert_start(struc
        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.