From patchwork Mon Mar 19 00:36:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Lyle X-Patchwork-Id: 10291489 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0383F60291 for ; Mon, 19 Mar 2018 00:37:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA78728D4B for ; Mon, 19 Mar 2018 00:37:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF51828F56; Mon, 19 Mar 2018 00:37:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8795A28D4B for ; Mon, 19 Mar 2018 00:37:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754723AbeCSAhM (ORCPT ); Sun, 18 Mar 2018 20:37:12 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:37136 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754850AbeCSAhC (ORCPT ); Sun, 18 Mar 2018 20:37:02 -0400 Received: by mail-pf0-f193.google.com with SMTP id h11so6370097pfn.4 for ; Sun, 18 Mar 2018 17:37:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lyle-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/ntqZCRWQ122p9L7EfvpM/mLLnfa72dnCIuVI1k0MjA=; b=Fc9OXHyoBvvNm+/A5nDp3cZ2+Aulalw0+ZoQavWOsMg52sdyAxucZ5oBc4dPeTi901 CXaLVtDQX65E6kbOMs7RZhuFUNE95KEvr1DUk7TtVqAVbf+jGf9YydBRTftHpRayJWNm wJeUqokuptDvnt2xOmX4u3OO/XAfvQqTiJriZKefiSrjKo8URsQFgl7+Ja7tBCMlf9YH hcwYCiGoNEoGs0MC9+7qyP3owWrE2TN6DRxNbTd4Nsdsi58D/UW3MHOeFVOwGB2nhlv6 VUlyDABPUVZ7u8M46IBFjrxQ3BWNK3rDeGpABcuTT0kS6TFxsF1P8uRZ/A/eJkLerMY2 1KrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/ntqZCRWQ122p9L7EfvpM/mLLnfa72dnCIuVI1k0MjA=; b=oB3OpoGrqQBOQqMwlk1GE2IolkAjlU7wKiQZ0ItuIYR16Lfq//Pu2lixfmYZcQ5HOZ MwtNiakq4mjKnbD4XizJSVV99pg+qveQZcofp296J4ckZaD8p/uu1n6GK6Xjck0HqMMp WY4LXK1YG8UiuakwFxFsP7T7jO3vTUaX983+IGKvXUgRmv9XsPKIb5EBYtl0VFc4pL3s 0vVrJNIASbynwCCuKYrLUYf0Aoe0oY+b/NmIntp3qoRdAZukz47rbGca1PnJ43jxMdwk 20SGOUtIDB/eQTI1eX/D94m4PjSgZq1RCyL7sLG8O/eYm2YWh4Gmx508shIIFOdhDxtT sG9Q== X-Gm-Message-State: AElRT7GJenCZDStJfVivXD4+kSzWdkem3niyUDh3H+Q3UsgDHoFRUEVj qdSx5gAgtJ2bguGoUNfRpFDBhZzO23g= X-Google-Smtp-Source: AG47ELv6I/Z6v6PbehH2/FW0qfXzaoRRHZdcKsA2xSIUbL30dr6FFMFAoAD5QZpS1a+9k7hotnt4Cw== X-Received: by 10.99.176.71 with SMTP id z7mr6582202pgo.74.1521419821924; Sun, 18 Mar 2018 17:37:01 -0700 (PDT) Received: from midnight.lan (2600-6c52-6200-09b7-0000-0000-0000-0d66.dhcp6.chtrptr.net. [2600:6c52:6200:9b7::d66]) by smtp.gmail.com with ESMTPSA id a17sm27674857pfc.122.2018.03.18.17.37.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Mar 2018 17:37:01 -0700 (PDT) From: Michael Lyle To: linux-bcache@vger.kernel.org, linux-block@vger.kernel.org Cc: axboe@fb.com, Bart Van Assche Subject: [for-4.17 18/20] bcache: Suppress more warnings about set-but-not-used variables Date: Sun, 18 Mar 2018 17:36:31 -0700 Message-Id: <20180319003633.27225-19-mlyle@lyle.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180319003633.27225-1-mlyle@lyle.org> References: <20180319003633.27225-1-mlyle@lyle.org> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bart Van Assche This patch does not change any functionality. Signed-off-by: Bart Van Assche Reviewed-by: Michael Lyle --- drivers/md/bcache/bset.c | 4 ++-- drivers/md/bcache/journal.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/md/bcache/bset.c b/drivers/md/bcache/bset.c index e56d3ecdbfcb..579c696a5fe0 100644 --- 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 c94085f400a4..acd0e5c074dd 100644 --- 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);