Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp496926ybb; Wed, 25 Mar 2020 04:08:50 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtM4pMf192ugtdFQYo+DUPxwoOCj6F/B6O7gb6zTitNEZyFWGmNhZs4fuSysXqO12OdK57e X-Received: by 2002:a05:6808:b3b:: with SMTP id t27mr394195oij.5.1585134530753; Wed, 25 Mar 2020 04:08:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585134530; cv=none; d=google.com; s=arc-20160816; b=TK5k4TrKYOCX9hil0tgYplmps4G9ZKfzQGj46U+iV+J4Nieu6SorAlJr1tCLg159NN jN5B560l57w5PJve5sFtpD1p9+g6ov1KpR8tI6J7gcCT6VUO9qx8Qx9CdL59+KhvOVx1 /BYYOzC3Xfa709QlkAhTq6WKUcihgyncMfYuE9AuNaS+mnBvD4ayAloqywh3ZOYT7wwQ 2oVfqPj3gEgln9nBdY3mjvbEx2ndSsJcEppyhlE11c6VYPFb8137E+9Zz8W3/1DxI83Z eG5VA3VIhOfVyOq0PiH+CyjF6as9g1QHWlqcUOacU+1x19Em6OEVJ49XLWhfQyW/LNh+ 4SVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Xj5cCj8r7SaDFtamrs+Fgedwd23OEns1xvko9GLsk5M=; b=O30l/nedNFF5EdW3s6n2BcAZ+CBHtXVzVSc0uet+Kyeh1jpA7WiVlyciKDYf8o1uRP QHxyOd41PT9htMfJedBKcornNYMkyxSzYrhWZN0bNmDhCvg1zewF2XVvxd2H2+hATnhG R6ibPKt5Ta05YBWkZiBm+fjI3QuIV7Y7/D8n4ewylpouIFVCjG/VV9MU17woRJt9sYZx otI/Cz/vUw+9ZzL8St4VLfVvx3dfoTUwk4gSx5moGdHW30hpxWyG2TXcYR4yY1lj0MWX DMioAU2hrB68kyPvzWF9u5IuC/hn0nqvk3uPlYBX667+mZijF7XbqYRyVUvQ6g/aAqKp oAdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=uhvgkR5E; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j9si10403362oif.164.2020.03.25.04.08.28; Wed, 25 Mar 2020 04:08:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=uhvgkR5E; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727499AbgCYLF6 (ORCPT + 99 others); Wed, 25 Mar 2020 07:05:58 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:57814 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726043AbgCYLF5 (ORCPT ); Wed, 25 Mar 2020 07:05:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=Xj5cCj8r7SaDFtamrs+Fgedwd23OEns1xvko9GLsk5M=; b=uhvgkR5ENy58dFitnfuFzxbUMm o8h494/2840b8bTFZ8xEzeB+yoOjjQuiiWeSIglHEuJcyLTWjcrk9Okov+eo3j4ZXCChNUFEcmOfD 8h52OUovUqmklMbCasiCXZ7jqSobrRwtVg8a4vQq4B7S5U6xNZqx9qCPnpJnJy4BdEXo8nDQnvSNu SRsmZfJ/beExLo21ncLiWmlPhTrI3a+UtGvPbTrdjnPIf+MNZ6ZGBiMV0uwE19FhgfibW3LlR3pSO EHTPWO6W+4Q815dnhpiEWC7VAnySVhuchIDC6K5TxMPIofd66jVBR1PJ4rp5imIGQaS7RUtSlXmWQ 6cDbV4Eg==; Received: from [2001:4bb8:18c:2a9e:999c:283e:b14a:9189] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jH3rB-0001tU-0w; Wed, 25 Mar 2020 11:05:57 +0000 From: Christoph Hellwig To: Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/8] block: mark part_in_flight and part_in_flight_rw static Date: Wed, 25 Mar 2020 12:03:32 +0100 Message-Id: <20200325110338.1029232-3-hch@lst.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200325110338.1029232-1-hch@lst.de> References: <20200325110338.1029232-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Christoph Hellwig --- block/genhd.c | 7 ++++--- include/linux/genhd.h | 3 --- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/block/genhd.c b/block/genhd.c index 52841f41d6eb..e8978df06f35 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -112,7 +112,8 @@ void part_dec_in_flight(struct request_queue *q, struct hd_struct *part, int rw) part_stat_local_dec(&part_to_disk(part)->part0, in_flight[rw]); } -unsigned int part_in_flight(struct request_queue *q, struct hd_struct *part) +static unsigned int part_in_flight(struct request_queue *q, + struct hd_struct *part) { int cpu; unsigned int inflight; @@ -132,8 +133,8 @@ unsigned int part_in_flight(struct request_queue *q, struct hd_struct *part) return inflight; } -void part_in_flight_rw(struct request_queue *q, struct hd_struct *part, - unsigned int inflight[2]) +static void part_in_flight_rw(struct request_queue *q, struct hd_struct *part, + unsigned int inflight[2]) { int cpu; diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 7310108f5351..18fd9e01c511 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -413,9 +413,6 @@ static inline void free_part_stats(struct hd_struct *part) #define part_stat_local_read_cpu(gendiskp, field, cpu) \ local_read(&(part_stat_get_cpu(gendiskp, field, cpu))) -unsigned int part_in_flight(struct request_queue *q, struct hd_struct *part); -void part_in_flight_rw(struct request_queue *q, struct hd_struct *part, - unsigned int inflight[2]); void part_dec_in_flight(struct request_queue *q, struct hd_struct *part, int rw); void part_inc_in_flight(struct request_queue *q, struct hd_struct *part, -- 2.25.1