All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>,
	linux-block@vger.kernel.org
Subject: [PATCH 2/3] block: remove the unused blk_integrity_merge_bio export
Date: Tue,  6 Oct 2020 09:07:18 +0200	[thread overview]
Message-ID: <20201006070719.427627-3-hch@lst.de> (raw)
In-Reply-To: <20201006070719.427627-1-hch@lst.de>

Also move the definition from the public blkdev.h to the private
block/blk.h header.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 block/blk-integrity.c  | 1 -
 block/blk.h            | 7 +++++++
 include/linux/blkdev.h | 8 --------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index a262e069eb3fe6..410da060d1f5ad 100644
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -211,7 +211,6 @@ bool blk_integrity_merge_bio(struct request_queue *q, struct request *req,
 
 	return true;
 }
-EXPORT_SYMBOL(blk_integrity_merge_bio);
 
 struct integrity_sysfs_entry {
 	struct attribute attr;
diff --git a/block/blk.h b/block/blk.h
index ba4e8ac538cdc7..8fcb146d30034f 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -122,6 +122,8 @@ static inline bool bio_integrity_endio(struct bio *bio)
 
 bool blk_integrity_merge_rq(struct request_queue *, struct request *,
 		struct request *);
+bool blk_integrity_merge_bio(struct request_queue *, struct request *,
+		struct bio *);
 
 static inline bool integrity_req_gap_back_merge(struct request *req,
 		struct bio *next)
@@ -151,6 +153,11 @@ static inline bool blk_integrity_merge_rq(struct request_queue *rq,
 {
 	return true;
 }
+static inline bool blk_integrity_merge_bio(struct request_queue *rq,
+		struct request *r, struct bio *b)
+{
+	return true;
+}
 static inline bool integrity_req_gap_back_merge(struct request *req,
 		struct bio *next)
 {
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 1c01e724659273..a8b04af50191dc 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1663,8 +1663,6 @@ extern int blk_integrity_compare(struct gendisk *, struct gendisk *);
 extern int blk_rq_map_integrity_sg(struct request_queue *, struct bio *,
 				   struct scatterlist *);
 extern int blk_rq_count_integrity_sg(struct request_queue *, struct bio *);
-extern bool blk_integrity_merge_bio(struct request_queue *, struct request *,
-				    struct bio *);
 
 static inline struct blk_integrity *blk_get_integrity(struct gendisk *disk)
 {
@@ -1792,12 +1790,6 @@ static inline unsigned short queue_max_integrity_segments(const struct request_q
 {
 	return 0;
 }
-static inline bool blk_integrity_merge_bio(struct request_queue *rq,
-					   struct request *r,
-					   struct bio *b)
-{
-	return true;
-}
 
 static inline unsigned int bio_integrity_intervals(struct blk_integrity *bi,
 						   unsigned int sectors)
-- 
2.28.0


  parent reply	other threads:[~2020-10-06  7:07 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-06  7:07 trivial block layer merging cleanups Christoph Hellwig
2020-10-06  7:07 ` [PATCH 1/3] block: remove the unused blk_integrity_merge_rq export Christoph Hellwig
2020-10-06  7:07 ` Christoph Hellwig [this message]
2020-10-06  7:07 ` [PATCH 3/3] block: move blk_mq_sched_try_merge to blk-merge.c Christoph Hellwig
2020-10-06 13:30 ` trivial block layer merging cleanups Jens Axboe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201006070719.427627-3-hch@lst.de \
    --to=hch@lst.de \
    --cc=axboe@kernel.dk \
    --cc=linux-block@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.