Merge branch 'for-2.6.26' of git://git.kernel.dk/linux-2.6-block

* 'for-2.6.26' of git://git.kernel.dk/linux-2.6-block:
  block: fix blk_register_queue() return value
  block: fix memory hotplug and bouncing in block layer
  block: replace remaining __FUNCTION__ occurrences
  Kconfig: clean up block/Kconfig help descriptions
  cciss: fix warning oops on rmmod of driver
  cciss: Fix race between disk-adding code and interrupt handler
  block: move the padding adjustment to blk_rq_map_sg
  block: add bio_copy_user_iov support to blk_rq_map_user_iov
  block: convert bio_copy_user to bio_copy_user_iov
  loop: manage partitions in disk image
  cdrom: use kmalloced buffers instead of buffers on stack
  cdrom: make unregister_cdrom() return void
  cdrom: use list_head for cdrom_device_info list
  cdrom: protect cdrom_device_info list by mutex
  cdrom: cleanup hardcoded error-code
  cdrom: remove ifdef CONFIG_SYSCTL

1 files changed, 9 insertions, 0 deletions

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 0f58616bcd7f..b5c5c4a9e3f0 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -220,6 +220,15 @@ new_segment:
                 bvprv = bvec;
         } /* segments in rq */
 
+
+        if (unlikely(rq->cmd_flags & REQ_COPY_USER) &&
+            (rq->data_len & q->dma_pad_mask)) {
+                unsigned int pad_len = (q->dma_pad_mask & ~rq->data_len) + 1;
+
+                sg->length += pad_len;
+                rq->extra_len += pad_len;
+        }
+
         if (q->dma_drain_size && q->dma_drain_needed(rq)) {
                 if (rq->cmd_flags & REQ_RW)
                         memset(q->dma_drain_buffer, 0, q->dma_drain_size);