6 files changed, 22 insertions, 25 deletions

diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
index a08e3eeac3c5..79a6d63e8ed3 100644
--- a/drivers/md/bcache/closure.h
+++ b/drivers/md/bcache/closure.h
@@ -320,7 +320,6 @@ static inline void closure_wake_up(struct closure_waitlist *list)
 do {                                                                    \
         set_closure_fn(_cl, _fn, _wq);                                  \
         closure_sub(_cl, CLOSURE_RUNNING + 1);                          \
-        return;                                                         \
 } while (0)
 
 /**
@@ -349,7 +348,6 @@ do {									\
 do {                                                                    \
         set_closure_fn(_cl, _fn, _wq);                                  \
         closure_queue(_cl);                                             \
-        return;                                                         \
 } while (0)
 
 /**
@@ -365,7 +363,6 @@ do {									\
 do {                                                                    \
         set_closure_fn(_cl, _destructor, NULL);                         \
         closure_sub(_cl, CLOSURE_RUNNING - CLOSURE_DESTRUCTOR + 1);     \
-        return;                                                         \
 } while (0)
 
 /**
diff --git a/drivers/md/bcache/io.c b/drivers/md/bcache/io.c
index fa028fa82df4..bf6a9ca18403 100644
--- a/drivers/md/bcache/io.c
+++ b/drivers/md/bcache/io.c
@@ -55,7 +55,7 @@ static void bch_bio_submit_split_done(struct closure *cl)
 
         s->bio->bi_end_io = s->bi_end_io;
         s->bio->bi_private = s->bi_private;
-        bio_endio_nodec(s->bio, 0);
+        bio_endio(s->bio, 0);
 
         closure_debug_destroy(&s->cl);
         mempool_free(s, s->p->bio_split_hook);
@@ -105,6 +105,7 @@ void bch_generic_make_request(struct bio *bio, struct bio_split_pool *p)
         } while (n != bio);
 
         continue_at(&s->cl, bch_bio_submit_split_done, NULL);
+        return;
 submit:
         generic_make_request(bio);
 }
diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c
index fe080ad0e558..418607a6ba33 100644
--- a/drivers/md/bcache/journal.c
+++ b/drivers/md/bcache/journal.c
@@ -157,7 +157,7 @@ int bch_journal_read(struct cache_set *c, struct list_head *list)
 
         for_each_cache(ca, c, iter) {
                 struct journal_device *ja = &ca->journal;
-                unsigned long bitmap[SB_JOURNAL_BUCKETS / BITS_PER_LONG];
+                DECLARE_BITMAP(bitmap, SB_JOURNAL_BUCKETS);
                 unsigned i, l, r, m;
                 uint64_t seq;
 
@@ -592,12 +592,14 @@ static void journal_write_unlocked(struct closure *cl)
 
         if (!w->need_write) {
                 closure_return_with_destructor(cl, journal_write_unlock);
+                return;
         } else if (journal_full(&c->journal)) {
                 journal_reclaim(c);
                 spin_unlock(&c->journal.lock);
 
                 btree_flush_write(c);
                 continue_at(cl, journal_write, system_wq);
+                return;
         }
 
         c->journal.blocks_free -= set_blocks(w->data, block_bytes(c));
diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c
index ab43faddb447..f292790997d7 100644
--- a/drivers/md/bcache/request.c
+++ b/drivers/md/bcache/request.c
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #include <linux/hash.h>
 #include <linux/random.h>
+#include <linux/backing-dev.h>
 
 #include <trace/events/bcache.h>
 
@@ -87,8 +88,10 @@ static void bch_data_insert_keys(struct closure *cl)
         if (journal_ref)
                 atomic_dec_bug(journal_ref);
 
-        if (!op->insert_data_done)
+        if (!op->insert_data_done) {
                 continue_at(cl, bch_data_insert_start, op->wq);
+                return;
+        }
 
         bch_keylist_free(&op->insert_keys);
         closure_return(cl);
@@ -215,8 +218,10 @@ static void bch_data_insert_start(struct closure *cl)
                 /* 1 for the device pointer and 1 for the chksum */
                 if (bch_keylist_realloc(&op->insert_keys,
                                         3 + (op->csum ? 1 : 0),
-                                        op->c))
+                                        op->c)) {
                         continue_at(cl, bch_data_insert_keys, op->wq);
+                        return;
+                }
 
                 k = op->insert_keys.top;
                 bkey_init(k);
@@ -254,6 +259,7 @@ static void bch_data_insert_start(struct closure *cl)
 
         op->insert_data_done = true;
         continue_at(cl, bch_data_insert_keys, op->wq);
+        return;
 err:
         /* bch_alloc_sectors() blocks if s->writeback = true */
         BUG_ON(op->writeback);
@@ -575,8 +581,10 @@ static void cache_lookup(struct closure *cl)
         ret = bch_btree_map_keys(&s->op, s->iop.c,
                                  &KEY(s->iop.inode, bio->bi_iter.bi_sector, 0),
                                  cache_lookup_fn, MAP_END_KEY);
-        if (ret == -EAGAIN)
+        if (ret == -EAGAIN) {
                 continue_at(cl, cache_lookup, bcache_wq);
+                return;
+        }
 
         closure_return(cl);
 }
@@ -619,7 +627,7 @@ static void do_bio_hook(struct search *s, struct bio *orig_bio)
         bio->bi_end_io          = request_endio;
         bio->bi_private         = &s->cl;
 
-        atomic_set(&bio->bi_cnt, 3);
+        bio_cnt_set(bio, 3);
 }
 
 static void search_free(struct closure *cl)
@@ -1084,6 +1092,7 @@ static void flash_dev_make_request(struct request_queue *q, struct bio *bio)
                 continue_at_nobarrier(&s->cl,
                                       flash_dev_nodata,
                                       bcache_wq);
+                return;
         } else if (rw) {
                 bch_keybuf_check_overlapping(&s->iop.c->moving_gc_keys,
                                         &KEY(d->id, bio->bi_iter.bi_sector, 0),
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index 4dd2bb7167f0..94980bfca434 100644
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -760,14 +760,8 @@ static void bcache_device_free(struct bcache_device *d)
         bio_split_pool_free(&d->bio_split_hook);
         if (d->bio_split)
                 bioset_free(d->bio_split);
-        if (is_vmalloc_addr(d->full_dirty_stripes))
-                vfree(d->full_dirty_stripes);
-        else
-                kfree(d->full_dirty_stripes);
-        if (is_vmalloc_addr(d->stripe_sectors_dirty))
-                vfree(d->stripe_sectors_dirty);
-        else
-                kfree(d->stripe_sectors_dirty);
+        kvfree(d->full_dirty_stripes);
+        kvfree(d->stripe_sectors_dirty);
 
         closure_debug_destroy(&d->cl);
 }
diff --git a/drivers/md/bcache/util.h b/drivers/md/bcache/util.h
index 98df7572b5f7..1d04c4859c70 100644
--- a/drivers/md/bcache/util.h
+++ b/drivers/md/bcache/util.h
@@ -52,10 +52,7 @@ struct closure;
 
 #define free_heap(heap)                                                 \
 do {                                                                    \
-        if (is_vmalloc_addr((heap)->data))                              \
-                vfree((heap)->data);                                    \
-        else                                                            \
-                kfree((heap)->data);                                    \
+        kvfree((heap)->data);                                           \
         (heap)->data = NULL;                                            \
 } while (0)
 
@@ -163,10 +160,7 @@ do {									\
 
 #define free_fifo(fifo)                                                 \
 do {                                                                    \
-        if (is_vmalloc_addr((fifo)->data))                              \
-                vfree((fifo)->data);                                    \
-        else                                                            \
-                kfree((fifo)->data);                                    \
+        kvfree((fifo)->data);                                           \
         (fifo)->data = NULL;                                            \
 } while (0)