Merge tag 'xfs-for-linus-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-artful-kernel.git] / block / bio.c

diff --git a/block/bio.c b/block/bio.c
index db85c5753a7656560200427d8f47ebb0eecb9458..2b375020fc49bab0bfcabda4fc3d16118b5f1512 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -270,11 +270,15 @@ static void bio_free(struct bio *bio)
        }
 }
 
-void bio_init(struct bio *bio)
+void bio_init(struct bio *bio, struct bio_vec *table,
+             unsigned short max_vecs)
 {
        memset(bio, 0, sizeof(*bio));
        atomic_set(&bio->__bi_remaining, 1);
        atomic_set(&bio->__bi_cnt, 1);
+
+       bio->bi_io_vec = table;
+       bio->bi_max_vecs = max_vecs;
 }
 EXPORT_SYMBOL(bio_init);
 
@@ -480,7 +484,7 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, int nr_iovecs, struct bio_set *bs)
                return NULL;
 
        bio = p + front_pad;
-       bio_init(bio);
+       bio_init(bio, NULL, 0);
 
        if (nr_iovecs > inline_vecs) {
                unsigned long idx = 0;
@@ -670,6 +674,7 @@ struct bio *bio_clone_bioset(struct bio *bio_src, gfp_t gfp_mask,
        switch (bio_op(bio)) {
        case REQ_OP_DISCARD:
        case REQ_OP_SECURE_ERASE:
+       case REQ_OP_WRITE_ZEROES:
                break;
        case REQ_OP_WRITE_SAME:
                bio->bi_io_vec[bio->bi_vcnt++] = bio_src->bi_io_vec[0];
@@ -847,6 +852,55 @@ done:
 }
 EXPORT_SYMBOL(bio_add_page);
 
+/**
+ * bio_iov_iter_get_pages - pin user or kernel pages and add them to a bio
+ * @bio: bio to add pages to
+ * @iter: iov iterator describing the region to be mapped
+ *
+ * Pins as many pages from *iter and appends them to @bio's bvec array. The
+ * pages will have to be released using put_page() when done.
+ */
+int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
+{
+       unsigned short nr_pages = bio->bi_max_vecs - bio->bi_vcnt;
+       struct bio_vec *bv = bio->bi_io_vec + bio->bi_vcnt;
+       struct page **pages = (struct page **)bv;
+       size_t offset, diff;
+       ssize_t size;
+
+       size = iov_iter_get_pages(iter, pages, LONG_MAX, nr_pages, &offset);
+       if (unlikely(size <= 0))
+               return size ? size : -EFAULT;
+       nr_pages = (size + offset + PAGE_SIZE - 1) / PAGE_SIZE;
+
+       /*
+        * Deep magic below:  We need to walk the pinned pages backwards
+        * because we are abusing the space allocated for the bio_vecs
+        * for the page array.  Because the bio_vecs are larger than the
+        * page pointers by definition this will always work.  But it also
+        * means we can't use bio_add_page, so any changes to it's semantics
+        * need to be reflected here as well.
+        */
+       bio->bi_iter.bi_size += size;
+       bio->bi_vcnt += nr_pages;
+
+       diff = (nr_pages * PAGE_SIZE - offset) - size;
+       while (nr_pages--) {
+               bv[nr_pages].bv_page = pages[nr_pages];
+               bv[nr_pages].bv_len = PAGE_SIZE;
+               bv[nr_pages].bv_offset = 0;
+       }
+
+       bv[0].bv_offset += offset;
+       bv[0].bv_len -= offset;
+       if (diff)
+               bv[bio->bi_vcnt - 1].bv_len -= diff;
+
+       iov_iter_advance(iter, size);
+       return 0;
+}
+EXPORT_SYMBOL_GPL(bio_iov_iter_get_pages);
+
 struct submit_bio_ret {
        struct completion event;
        int error;
@@ -1786,15 +1840,7 @@ struct bio *bio_split(struct bio *bio, int sectors,
        BUG_ON(sectors <= 0);
        BUG_ON(sectors >= bio_sectors(bio));
 
-       /*
-        * Discards need a mutable bio_vec to accommodate the payload
-        * required by the DSM TRIM and UNMAP commands.
-        */
-       if (bio_op(bio) == REQ_OP_DISCARD || bio_op(bio) == REQ_OP_SECURE_ERASE)
-               split = bio_clone_bioset(bio, gfp, bs);
-       else
-               split = bio_clone_fast(bio, gfp, bs);
-
+       split = bio_clone_fast(bio, gfp, bs);
        if (!split)
                return NULL;