summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.com>2017-06-18 14:38:59 +1000
committerJens Axboe <axboe@kernel.dk>2017-06-18 12:40:59 -0600
commit9b10f6a9c2aaab49c56b8cff0facdc1b64ed7e1c (patch)
tree13b9e81781e6d44a15dca67215c950ab019f714b /block
parent5a136fdf5a0ab3c021ef6d989bb56a361e132234 (diff)
downloadlinux-9b10f6a9c2aaab49c56b8cff0facdc1b64ed7e1c.tar.gz
linux-9b10f6a9c2aaab49c56b8cff0facdc1b64ed7e1c.tar.bz2
linux-9b10f6a9c2aaab49c56b8cff0facdc1b64ed7e1c.zip
block: remove bio_clone() and all references.
bio_clone() is no longer used. Only bio_clone_bioset() or bio_clone_fast(). This is for the best, as bio_clone() used fs_bio_set, and filesystems are unlikely to want to use bio_clone(). So remove bio_clone() and all references. This includes a fix to some incorrect documentation. Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Ming Lei <ming.lei@redhat.com> Signed-off-by: NeilBrown <neilb@suse.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/bio.c2
-rw-r--r--block/blk-merge.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/block/bio.c b/block/bio.c
index 2bd064906e06..89a51bd49ab7 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -547,7 +547,7 @@ EXPORT_SYMBOL(zero_fill_bio);
*
* Description:
* Put a reference to a &struct bio, either one you have gotten with
- * bio_alloc, bio_get or bio_clone. The last put of a bio will free it.
+ * bio_alloc, bio_get or bio_clone_*. The last put of a bio will free it.
**/
void bio_put(struct bio *bio)
{
diff --git a/block/blk-merge.c b/block/blk-merge.c
index 51c84540d3bb..e7862e9dcc39 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -115,13 +115,13 @@ static struct bio *blk_bio_segment_split(struct request_queue *q,
* With arbitrary bio size, the incoming bio may be very
* big. We have to split the bio into small bios so that
* each holds at most BIO_MAX_PAGES bvecs because
- * bio_clone() can fail to allocate big bvecs.
+ * bio_clone_bioset() can fail to allocate big bvecs.
*
- * Those drivers which will need to use bio_clone()
+ * Those drivers which will need to use bio_clone_bioset()
* should tell us in some way. For now, impose the
* BIO_MAX_PAGES limit on all queues.
*
- * TODO: handle users of bio_clone() differently.
+ * TODO: handle users of bio_clone_bioset() differently.
*/
if (bvecs++ >= BIO_MAX_PAGES)
goto split;