From patchwork Fri Aug 4 15:04:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 9881501 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 723AF6031B for ; Fri, 4 Aug 2017 15:04:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 65EFA288D1 for ; Fri, 4 Aug 2017 15:04:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A9FC289E1; Fri, 4 Aug 2017 15:04:34 +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.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 F1E8A289D3 for ; Fri, 4 Aug 2017 15:04:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752064AbdHDPEd (ORCPT ); Fri, 4 Aug 2017 11:04:33 -0400 Received: from mail-io0-f169.google.com ([209.85.223.169]:34491 "EHLO mail-io0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752146AbdHDPEc (ORCPT ); Fri, 4 Aug 2017 11:04:32 -0400 Received: by mail-io0-f169.google.com with SMTP id o9so6971873iod.1 for ; Fri, 04 Aug 2017 08:04:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5sM8ZBf6RWFgRNacLU+FDW7msZVb9Bx7JCcr/VFCL4s=; b=wqcYgx90MLAaP1QJzR6OVS0qmeTCm3hTf92grHZdZzWK8K2OpJjdb+ZVKuEZBcAoRQ WRD2UYPyJPLmpiKABnfa66GGXZUkFO4tgBiPr5yni73lTxBQuF76yxNC6hlEUDMG2yje ORgLskK1mpNAUjeoYHNkdICJY5DRMS1YjDDavUJtf2Cmdiol3Lz89Tl+xwVHN2U307L3 61qIuJB/+r5LTYq5nfkbtlQg2sHOKeWyrNlY0DPOZtZwTmfSzqzbFH118XRF4ZLNHFLi hOMyJa462uj+UkJeqTnlW1Gp/pHLkSC/E+A+nWWD8zT5aaSKNHOc8GgGRQmjHqqsAzDN 8XrA== 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=5sM8ZBf6RWFgRNacLU+FDW7msZVb9Bx7JCcr/VFCL4s=; b=Q8Q9oswarGRYOtgoW4qkxLQOPm6xu6QNmTE38Olkrh2wLoyb7WdVzxEu7K4LUeB7d5 aQ+a02OFyN/bJKkTqpBXQjfsNSqK0roWZaNs5QmPH2mMwmeRo0oKQSXHsxQ8BHC4r4ji FNDGQQF1QkxFY0Ch+oclynvynzYflsVKX+VUxZbkqeouTZ9TVA5zeMkpTXQ3L8Ti48Cb pVp0fJrh6jH6aB2WPL7+xPmP9jT3GZXDmU+niv0lFIO1ZfXl4yBDpZobzphuxo85Vo80 a+B/oUZ0r6OcD+kbjbKk3g1WXXBaSEwOM5PGP2LP673J4eIpeyiK1ZMxh5jCasSw0a9C +mJA== X-Gm-Message-State: AHYfb5gUbKRne4a8wbEhJxKwsYT2dbxPh6iwDhMQD4dspmzadYcfbLZE 8G4Srf1CE4Iysn3MpFQu1A== X-Received: by 10.107.173.206 with SMTP id m75mr3059531ioo.152.1501859071696; Fri, 04 Aug 2017 08:04:31 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id w207sm763245itc.34.2017.08.04.08.04.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Aug 2017 08:04:31 -0700 (PDT) From: Jens Axboe To: linux-block@vger.kernel.org Cc: brking@linux.vnet.ibm.com, bart.vanassche@wdc.com, Jens Axboe Subject: [PATCH 6/6] sbitmap: make sb_for_each_fn() return void Date: Fri, 4 Aug 2017 09:04:22 -0600 Message-Id: <1501859062-11120-7-git-send-email-axboe@kernel.dk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1501859062-11120-1-git-send-email-axboe@kernel.dk> References: <1501859062-11120-1-git-send-email-axboe@kernel.dk> 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 The intent was for users to be able to continue/break iteration based on the return value of this callback function, but all callers now always return true. Hence it's pointless to return anything at all. Change it to void, and update the users of it. Signed-off-by: Jens Axboe --- block/blk-mq-tag.c | 6 ++---- block/blk-mq.c | 3 +-- include/linux/sbitmap.h | 6 ++---- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c index b856b2827157..5ee218f11f81 100644 --- a/block/blk-mq-tag.c +++ b/block/blk-mq-tag.c @@ -202,7 +202,7 @@ struct bt_iter_data { bool reserved; }; -static bool bt_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) +static void bt_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) { struct bt_iter_data *iter_data = data; struct blk_mq_hw_ctx *hctx = iter_data->hctx; @@ -216,7 +216,6 @@ static bool bt_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) if (rq && rq->q == hctx->queue) iter_data->fn(hctx, rq, iter_data->data, reserved); - return true; } static void bt_for_each(struct blk_mq_hw_ctx *hctx, struct sbitmap_queue *bt, @@ -239,7 +238,7 @@ struct bt_tags_iter_data { bool reserved; }; -static bool bt_tags_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) +static void bt_tags_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) { struct bt_tags_iter_data *iter_data = data; struct blk_mq_tags *tags = iter_data->tags; @@ -251,7 +250,6 @@ static bool bt_tags_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) rq = tags->rqs[bitnr]; if (rq) iter_data->fn(rq, iter_data->data, reserved); - return true; } static void bt_tags_for_each(struct blk_mq_tags *tags, struct sbitmap_queue *bt, diff --git a/block/blk-mq.c b/block/blk-mq.c index 410ed246bc9b..c8d568aafcec 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -846,7 +846,7 @@ struct flush_busy_ctx_data { struct list_head *list; }; -static bool flush_busy_ctx(struct sbitmap *sb, unsigned int bitnr, void *data) +static void flush_busy_ctx(struct sbitmap *sb, unsigned int bitnr, void *data) { struct flush_busy_ctx_data *flush_data = data; struct blk_mq_hw_ctx *hctx = flush_data->hctx; @@ -856,7 +856,6 @@ static bool flush_busy_ctx(struct sbitmap *sb, unsigned int bitnr, void *data) spin_lock(&ctx->lock); list_splice_tail_init(&ctx->rq_list, flush_data->list); spin_unlock(&ctx->lock); - return true; } /* diff --git a/include/linux/sbitmap.h b/include/linux/sbitmap.h index a1904aadbc45..33c3d8957927 100644 --- a/include/linux/sbitmap.h +++ b/include/linux/sbitmap.h @@ -211,7 +211,7 @@ bool sbitmap_any_bit_set(const struct sbitmap *sb); */ bool sbitmap_any_bit_clear(const struct sbitmap *sb); -typedef bool (*sb_for_each_fn)(struct sbitmap *, unsigned int, void *); +typedef void (*sb_for_each_fn)(struct sbitmap *, unsigned int, void *); /** * sbitmap_for_each_set() - Iterate over each set bit in a &struct sbitmap. @@ -241,9 +241,7 @@ static inline void sbitmap_for_each_set(struct sbitmap *sb, sb_for_each_fn fn, if (nr >= word->depth) break; - if (!fn(sb, off + nr, data)) - return; - + fn(sb, off + nr, data); nr++; } }