tracing: Disable snapshot buffer when stopping instance tracers

[platform/kernel/linux-starfive.git] / block / blk-map.c

diff --git a/block/blk-map.c b/block/blk-map.c
index 46eed2e..8584bab 100644 (file)
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -281,21 +281,21 @@ static int bio_map_user_iov(struct request *rq, struct iov_iter *iter,
 
        if (blk_queue_pci_p2pdma(rq->q))
                extraction_flags |= ITER_ALLOW_P2PDMA;
+       if (iov_iter_extract_will_pin(iter))
+               bio_set_flag(bio, BIO_PAGE_PINNED);
 
        while (iov_iter_count(iter)) {
-               struct page **pages, *stack_pages[UIO_FASTIOV];
+               struct page *stack_pages[UIO_FASTIOV];
+               struct page **pages = stack_pages;
                ssize_t bytes;
                size_t offs;
                int npages;
 
-               if (nr_vecs <= ARRAY_SIZE(stack_pages)) {
-                       pages = stack_pages;
-                       bytes = iov_iter_get_pages(iter, pages, LONG_MAX,
-                                                  nr_vecs, &offs, extraction_flags);
-               } else {
-                       bytes = iov_iter_get_pages_alloc(iter, &pages,
-                                               LONG_MAX, &offs, extraction_flags);
-               }
+               if (nr_vecs > ARRAY_SIZE(stack_pages))
+                       pages = NULL;
+
+               bytes = iov_iter_extract_pages(iter, &pages, LONG_MAX,
+                                              nr_vecs, extraction_flags, &offs);
                if (unlikely(bytes <= 0)) {
                        ret = bytes ? bytes : -EFAULT;
                        goto out_unmap;
@@ -315,12 +315,11 @@ static int bio_map_user_iov(struct request *rq, struct iov_iter *iter,
                                        n = bytes;
 
                                if (!bio_add_hw_page(rq->q, bio, page, n, offs,
-                                                    max_sectors, &same_page)) {
-                                       if (same_page)
-                                               put_page(page);
+                                                    max_sectors, &same_page))
                                        break;
-                               }
 
+                               if (same_page)
+                                       bio_release_page(bio, page);
                                bytes -= n;
                                offs = 0;
                        }
@@ -329,7 +328,7 @@ static int bio_map_user_iov(struct request *rq, struct iov_iter *iter,
                 * release the pages we didn't map into the bio, if any
                 */
                while (j < npages)
-                       put_page(pages[j++]);
+                       bio_release_page(bio, pages[j++]);
                if (pages != stack_pages)
                        kvfree(pages);
                /* couldn't stuff something into bio? */