block: restore the meaning of rq->data_len to the true data length

[mirror_ubuntu-artful-kernel.git] / block / blk-merge.c

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 7506c4fe0264bd6038d24108f5438fea42478508..0f58616bcd7f183514c43eb913f0e0c23c855215 100644 (file)
--- 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)