summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2019-04-25 09:04:33 +0200
committerJens Axboe <axboe@kernel.dk>2019-04-30 09:26:41 -0600
commit4713839dfe8269d27d83a33d1e39f9c2970eb31a (patch)
tree1cad7f712e13fe99969850cdf91eff4fb017d3a6
parent2b070cfe582b8e99fec6ada57d2e59e194aae202 (diff)
downloadlwn-4713839dfe8269d27d83a33d1e39f9c2970eb31a.tar.gz
lwn-4713839dfe8269d27d83a33d1e39f9c2970eb31a.zip
block: remove the __bio_add_pc_page export
The same page optimization is a rather odd corner case, which is not used outside bio.c and which really should not be used outside of bio.c either - we have better highlevel helpers like the rq/bio mapping helpers. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--block/bio.c3
-rw-r--r--include/linux/bio.h3
2 files changed, 1 insertions, 5 deletions
diff --git a/block/bio.c b/block/bio.c
index 9ad0d00cdc9b..e717b303e1fb 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -709,7 +709,7 @@ static bool can_add_page_to_seg(struct request_queue *q,
*
* This should only be used by passthrough bios.
*/
-int __bio_add_pc_page(struct request_queue *q, struct bio *bio,
+static int __bio_add_pc_page(struct request_queue *q, struct bio *bio,
struct page *page, unsigned int len, unsigned int offset,
bool put_same_page)
{
@@ -776,7 +776,6 @@ int __bio_add_pc_page(struct request_queue *q, struct bio *bio,
bio_set_flag(bio, BIO_SEG_VALID);
return len;
}
-EXPORT_SYMBOL(__bio_add_pc_page);
int bio_add_pc_page(struct request_queue *q, struct bio *bio,
struct page *page, unsigned int len, unsigned int offset)
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 186b2723c61b..077cecdf9437 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -435,9 +435,6 @@ void bio_chain(struct bio *, struct bio *);
extern int bio_add_page(struct bio *, struct page *, unsigned int,unsigned int);
extern int bio_add_pc_page(struct request_queue *, struct bio *, struct page *,
unsigned int, unsigned int);
-extern int __bio_add_pc_page(struct request_queue *, struct bio *,
- struct page *, unsigned int, unsigned int,
- bool);
bool __bio_try_merge_page(struct bio *bio, struct page *page,
unsigned int len, unsigned int off, bool same_page);
void __bio_add_page(struct bio *bio, struct page *page,