diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2015-08-07 18:15:14 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-08-17 08:12:56 -0600 |
| commit | da81ed16bdb3bc1bf92e6cb3340915a3204d5ace (patch) | |
| tree | 0b4aac6c8fab5af29d1cd136f677506bea2284fd | |
| parent | c56f6d1270b9fc31144b59106bc8590c2acf4a8e (diff) | |
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>
| -rw-r--r-- | block/blk-merge.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/card/queue.c | 4 |
2 files changed, 3 insertions, 3 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, diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c index 5daf302835b1..6f4323c6d653 100644 --- 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; |