From: Christoph Hellwig <hch@lst.de>
Date: Wed, 25 Mar 2020 16:48:36 +0100
Subject: [PATCH] block: mark part_in_flight and part_in_flight_rw static
References: bsc#1175995,jsc#SLE-15608
Git-commit: 6005771c17db56b6a9acc12bd084134191560e18
Patch-mainline: v5.7-rc1
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
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 5444f9dd7aef..c0081fa0a267 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -139,7 +139,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;
@@ -159,8 +160,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 97876926d4ba..e74b36077201 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -394,9 +394,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.16.4