X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=block%2Fblk-merge.c;h=0f58616bcd7f183514c43eb913f0e0c23c855215;hb=f17520e1f19172057328e50ffed01a42534921e9;hp=7506c4fe0264bd6038d24108f5438fea42478508;hpb=91e229bbad6524aabaac8717b2f559283670c37a;p=linux-2.6-omap-h63xx.git

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 7506c4fe026..0f58616bcd7 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -231,7 +231,7 @@ new_segment:
 			    ((unsigned long)q->dma_drain_buffer) &
 			    (PAGE_SIZE - 1));
 		nsegs++;
-		rq->data_len += q->dma_drain_size;
+		rq->extra_len += q->dma_drain_size;
 	}
 
 	if (sg)