From: hch@lst.de (Christoph Hellwig)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/13] block: move integrity_req_gap_{back, front}_merge to blk.h
Date: Tue, 4 Sep 2018 12:14:22 -0700 [thread overview]
Message-ID: <20180904191431.20102-5-hch@lst.de> (raw)
In-Reply-To: <20180904191431.20102-1-hch@lst.de>
No need to expose these to drivers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk.h | 35 +++++++++++++++++++++++++++++++++--
include/linux/blkdev.h | 31 -------------------------------
2 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/block/blk.h b/block/blk.h
index 9db4e389582c..441c2de1d4b9 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -158,7 +158,38 @@ static inline bool bio_integrity_endio(struct bio *bio)
return __bio_integrity_endio(bio);
return true;
}
-#else
+
+static inline bool integrity_req_gap_back_merge(struct request *req,
+ struct bio *next)
+{
+ struct bio_integrity_payload *bip = bio_integrity(req->bio);
+ struct bio_integrity_payload *bip_next = bio_integrity(next);
+
+ return bvec_gap_to_prev(req->q, &bip->bip_vec[bip->bip_vcnt - 1],
+ bip_next->bip_vec[0].bv_offset);
+}
+
+static inline bool integrity_req_gap_front_merge(struct request *req,
+ struct bio *bio)
+{
+ struct bio_integrity_payload *bip = bio_integrity(bio);
+ struct bio_integrity_payload *bip_next = bio_integrity(req->bio);
+
+ return bvec_gap_to_prev(req->q, &bip->bip_vec[bip->bip_vcnt - 1],
+ bip_next->bip_vec[0].bv_offset);
+}
+#else /* CONFIG_BLK_DEV_INTEGRITY */
+static inline bool integrity_req_gap_back_merge(struct request *req,
+ struct bio *next)
+{
+ return false;
+}
+static inline bool integrity_req_gap_front_merge(struct request *req,
+ struct bio *bio)
+{
+ return false;
+}
+
static inline void blk_flush_integrity(void)
{
}
@@ -166,7 +197,7 @@ static inline bool bio_integrity_endio(struct bio *bio)
{
return true;
}
-#endif
+#endif /* CONFIG_BLK_DEV_INTEGRITY */
void blk_timeout_work(struct work_struct *work);
unsigned long blk_rq_timeout(unsigned long timeout);
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index d6869e0e2b64..bc534c857344 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1843,26 +1843,6 @@ queue_max_integrity_segments(struct request_queue *q)
return q->limits.max_integrity_segments;
}
-static inline bool integrity_req_gap_back_merge(struct request *req,
- struct bio *next)
-{
- struct bio_integrity_payload *bip = bio_integrity(req->bio);
- struct bio_integrity_payload *bip_next = bio_integrity(next);
-
- return bvec_gap_to_prev(req->q, &bip->bip_vec[bip->bip_vcnt - 1],
- bip_next->bip_vec[0].bv_offset);
-}
-
-static inline bool integrity_req_gap_front_merge(struct request *req,
- struct bio *bio)
-{
- struct bio_integrity_payload *bip = bio_integrity(bio);
- struct bio_integrity_payload *bip_next = bio_integrity(req->bio);
-
- return bvec_gap_to_prev(req->q, &bip->bip_vec[bip->bip_vcnt - 1],
- bip_next->bip_vec[0].bv_offset);
-}
-
/**
* bio_integrity_intervals - Return number of integrity intervals for a bio
* @bi: blk_integrity profile for device
@@ -1947,17 +1927,6 @@ static inline bool blk_integrity_merge_bio(struct request_queue *rq,
return true;
}
-static inline bool integrity_req_gap_back_merge(struct request *req,
- struct bio *next)
-{
- return false;
-}
-static inline bool integrity_req_gap_front_merge(struct request *req,
- struct bio *bio)
-{
- return false;
-}
-
static inline unsigned int bio_integrity_intervals(struct blk_integrity *bi,
unsigned int sectors)
{
--
2.18.0
next prev parent reply other threads:[~2018-09-04 19:14 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-04 19:14 clean up physical merging helpers Christoph Hellwig
2018-09-04 19:14 ` [PATCH 01/13] arm: remove the unused BIOVEC_MERGEABLE define Christoph Hellwig
2018-09-04 19:14 ` [PATCH 02/13] xen: remove the xen_biovec_phys_mergeable export Christoph Hellwig
2018-09-04 19:14 ` [PATCH 03/13] xen: provide a prototype for xen_biovec_phys_mergeable in xen.h Christoph Hellwig
2018-09-04 19:14 ` Christoph Hellwig [this message]
2018-09-04 19:14 ` [PATCH 05/13] block: move req_gap_{back,front}_merge to blk-merge.c Christoph Hellwig
2018-09-04 19:14 ` [PATCH 06/13] block: move req_gap_back_merge to blk.h Christoph Hellwig
2018-09-04 19:14 ` [PATCH 07/13] block: simplify BIOVEC_PHYS_MERGEABLE Christoph Hellwig
2018-09-04 19:14 ` [PATCH 08/13] block: add a missing BIOVEC_SEG_BOUNDARY check in bio_add_pc_page Christoph Hellwig
2018-09-04 19:14 ` [PATCH 09/13] block: merge BIOVEC_SEG_BOUNDARY into biovec_phys_mergeable Christoph Hellwig
2018-09-04 19:14 ` [PATCH 10/13] block: remove bvec_to_phys Christoph Hellwig
2018-09-04 19:36 ` Geert Uytterhoeven
2018-09-04 19:14 ` [PATCH 11/13] block: don't include io.h from bio.h Christoph Hellwig
2018-09-04 19:14 ` [PATCH 12/13] block: don't include bug.h " Christoph Hellwig
2018-09-04 19:14 ` [PATCH 13/13] xen: don't include <xen/xen.h> from <asm/io.h> and <asm/dma-mapping.h> Christoph Hellwig
2018-09-15 7:03 ` clean up physical merging helpers Christoph Hellwig
2018-09-15 14:47 ` Jens Axboe
2018-09-20 6:29 ` Christoph Hellwig
2018-09-20 7:52 ` Christoph Hellwig
2018-09-20 14:39 ` Jens Axboe
2018-09-24 14:25 ` [Xen-devel] " Boris Ostrovsky
2018-09-25 20:29 ` Christoph Hellwig
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=20180904191431.20102-5-hch@lst.de \
--to=hch@lst.de \
--cc=linux-arm-kernel@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).