X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=block%2Fblk-merge.c;h=b5c5c4a9e3f08d051a25d44e92689580d19cbce5;hb=b912b5e2cfb35c02c9c79d3f6e31753f3be4dd83;hp=0f58616bcd7f183514c43eb913f0e0c23c855215;hpb=ae51801ba5ca27c2c571eb508daa99b392e79bd4;p=linux-2.6

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 0f58616bcd..b5c5c4a9e3 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);