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>

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 0027def..25ebac8 100644 (file)
--- 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,

diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index 5daf302..6f4323c 100644 (file)
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -467,7 +467,7 @@ static unsigned int mmc_queue_packed_map_sg(struct mmc_queue *mq,
                        sg_set_buf(__sg, buf + offset, len);
                        offset += len;
                        remain -= len;
-                       (__sg++)->page_link &= ~0x02;
+                       sg_unmark_end(__sg++);
                        sg_len++;
                } while (remain);
        }
@@ -475,7 +475,7 @@ static unsigned int mmc_queue_packed_map_sg(struct mmc_queue *mq,
        list_for_each_entry(req, &packed->list, queuelist) {
                sg_len += blk_rq_map_sg(mq->queue, req, __sg);
                __sg = sg + (sg_len - 1);
-               (__sg++)->page_link &= ~0x02;
+               sg_unmark_end(__sg++);
        }
        sg_mark_end(sg + (sg_len - 1));
        return sg_len;