bcache: Suppress more warnings about set-but-not-used variables

This patch does not change any functionality.

Reviewed-by: Michael Lyle <mlyle@lyle.org>
Reviewed-by: Coly Li <colyli@suse.de>
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/md/bcache/bset.c b/drivers/md/bcache/bset.c
index e56d3ec..579c696 100644 (file)
--- a/drivers/md/bcache/bset.c
+++ b/drivers/md/bcache/bset.c
@@ -1072,7 +1072,7 @@ EXPORT_SYMBOL(bch_btree_iter_init);
 static inline struct bkey *__bch_btree_iter_next(struct btree_iter *iter,
                                                 btree_iter_cmp_fn *cmp)
 {
-       struct btree_iter_set unused;
+       struct btree_iter_set b __maybe_unused;
        struct bkey *ret = NULL;
 
        if (!btree_iter_end(iter)) {
@@ -1087,7 +1087,7 @@ static inline struct bkey *__bch_btree_iter_next(struct btree_iter *iter,
                }
 
                if (iter->data->k == iter->data->end)
-                       heap_pop(iter, unused, cmp);
+                       heap_pop(iter, b, cmp);
                else
                        heap_sift(iter, 0, cmp);
        }

diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c
index c94085f..acd0e5c 100644 (file)
--- a/drivers/md/bcache/journal.c
+++ b/drivers/md/bcache/journal.c
@@ -493,7 +493,7 @@ static void journal_reclaim(struct cache_set *c)
        struct cache *ca;
        uint64_t last_seq;
        unsigned iter, n = 0;
-       atomic_t p;
+       atomic_t p __maybe_unused;
 
        atomic_long_inc(&c->reclaim);