1 files changed, 22 insertions, 24 deletions

diff --git a/block/blk-map.c b/block/blk-map.c
index c07d9c8317f4..3c942bd6422a 100644
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -5,6 +5,7 @@
 #include <linux/module.h>
 #include <linux/bio.h>
 #include <linux/blkdev.h>
+#include <scsi/sg.h>            /* for struct sg_iovec */
 
 #include "blk.h"
 
@@ -140,25 +141,8 @@ int blk_rq_map_user(struct request_queue *q, struct request *rq,
                 ubuf += ret;
         }
 
-        /*
-         * __blk_rq_map_user() copies the buffers if starting address
-         * or length isn't aligned to dma_pad_mask.  As the copied
-         * buffer is always page aligned, we know that there's enough
-         * room for padding.  Extend the last bio and update
-         * rq->data_len accordingly.
-         *
-         * On unmap, bio_uncopy_user() will use unmodified
-         * bio_map_data pointed to by bio->bi_private.
-         */
-        if (len & q->dma_pad_mask) {
-                unsigned int pad_len = (q->dma_pad_mask & ~len) + 1;
-                struct bio *tail = rq->biotail;
-
-                tail->bi_io_vec[tail->bi_vcnt - 1].bv_len += pad_len;
-                tail->bi_size += pad_len;
-
-                rq->extra_len += pad_len;
-        }
+        if (!bio_flagged(bio, BIO_USER_MAPPED))
+                rq->cmd_flags |= REQ_COPY_USER;
 
         rq->buffer = rq->data = NULL;
         return 0;
@@ -194,15 +178,26 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
                         struct sg_iovec *iov, int iov_count, unsigned int len)
 {
         struct bio *bio;
+        int i, read = rq_data_dir(rq) == READ;
+        int unaligned = 0;
 
         if (!iov || iov_count <= 0)
                 return -EINVAL;
 
-        /* we don't allow misaligned data like bio_map_user() does.  If the
-         * user is using sg, they're expected to know the alignment constraints
-         * and respect them accordingly */
-        bio = bio_map_user_iov(q, NULL, iov, iov_count,
-                                rq_data_dir(rq) == READ);
+        for (i = 0; i < iov_count; i++) {
+                unsigned long uaddr = (unsigned long)iov[i].iov_base;
+
+                if (uaddr & queue_dma_alignment(q)) {
+                        unaligned = 1;
+                        break;
+                }
+        }
+
+        if (unaligned || (q->dma_pad_mask & len))
+                bio = bio_copy_user_iov(q, iov, iov_count, read);
+        else
+                bio = bio_map_user_iov(q, NULL, iov, iov_count, read);
+
         if (IS_ERR(bio))
                 return PTR_ERR(bio);
 
@@ -212,6 +207,9 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
                 return -EINVAL;
         }
 
+        if (!bio_flagged(bio, BIO_USER_MAPPED))
+                rq->cmd_flags |= REQ_COPY_USER;
+
         bio_get(bio);
         blk_rq_bio_prep(q, rq, bio);
         rq->buffer = rq->data = NULL;