Merge tag 'rtc-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

[people/ms/linux.git] / block / blk-map.c

diff --git a/block/blk-map.c b/block/blk-map.c
index df8b066cd548913ca6455d81fee594d2feeed69c..7196a6b64c80271e60a4917e95204da6b283b7cc 100644 (file)
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -254,7 +254,7 @@ static int bio_map_user_iov(struct request *rq, struct iov_iter *iter,
                size_t offs, added = 0;
                int npages;
 
-               bytes = iov_iter_get_pages_alloc(iter, &pages, LONG_MAX, &offs);
+               bytes = iov_iter_get_pages_alloc2(iter, &pages, LONG_MAX, &offs);
                if (unlikely(bytes <= 0)) {
                        ret = bytes ? bytes : -EFAULT;
                        goto out_unmap;
@@ -284,7 +284,6 @@ static int bio_map_user_iov(struct request *rq, struct iov_iter *iter,
                                bytes -= n;
                                offs = 0;
                        }
-                       iov_iter_advance(iter, added);
                }
                /*
                 * release the pages we didn't map into the bio, if any
@@ -293,8 +292,10 @@ static int bio_map_user_iov(struct request *rq, struct iov_iter *iter,
                        put_page(pages[j++]);
                kvfree(pages);
                /* couldn't stuff something into bio? */
-               if (bytes)
+               if (bytes) {
+                       iov_iter_revert(iter, bytes);
                        break;
+               }
        }
 
        ret = blk_rq_append_bio(rq, bio);