aboutsummaryrefslogtreecommitdiff
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2015-08-07 18:15:14 +0200
committerJens Axboe <axboe@fb.com>2015-08-17 08:12:56 -0600
commitda81ed16bdb3bc1bf92e6cb3340915a3204d5ace (patch)
tree0b4aac6c8fab5af29d1cd136f677506bea2284fd /block/blk-merge.c
parentc56f6d1270b9fc31144b59106bc8590c2acf4a8e (diff)
downloadlinux-linaro-stable-da81ed16bdb3bc1bf92e6cb3340915a3204d5ace.tar.gz
scatterlist: remove open coded sg_unmark_end instances
Signed-off-by: Dan Williams <dan.j.williams@intel.com> [hch: split from a larger patch by Dan] Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-merge.c')
-rw-r--r--block/blk-merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c
index 0027def35f5a..25ebac8560cf 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -394,7 +394,7 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
if (rq->cmd_flags & REQ_WRITE)
memset(q->dma_drain_buffer, 0, q->dma_drain_size);
- sg->page_link &= ~0x02;
+ sg_unmark_end(sg);
sg = sg_next(sg);
sg_set_page(sg, virt_to_page(q->dma_drain_buffer),
q->dma_drain_size,