hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Dan Williams 2015-08-07 18:15:14 +02:00 committed by Jens Axboe
parent c56f6d1270
commit da81ed16bd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/blk-merge.c
View File

@ -394,7 +394,7 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
if (rq->cmd_flags & REQ_WRITE) if (rq->cmd_flags & REQ_WRITE)
memset(q->dma_drain_buffer, 0, q->dma_drain_size); memset(q->dma_drain_buffer, 0, q->dma_drain_size);
sg->page_link &= ~0x02; sg_unmark_end(sg);
sg = sg_next(sg); sg = sg_next(sg);
sg_set_page(sg, virt_to_page(q->dma_drain_buffer), sg_set_page(sg, virt_to_page(q->dma_drain_buffer),
q->dma_drain_size, q->dma_drain_size,

4
drivers/mmc/card/queue.c
View File

@ -467,7 +467,7 @@ static unsigned int mmc_queue_packed_map_sg(struct mmc_queue *mq,
sg_set_buf(__sg, buf + offset, len); sg_set_buf(__sg, buf + offset, len);
offset += len; offset += len;
remain -= len; remain -= len;
(__sg++)->page_link &= ~0x02; sg_unmark_end(__sg++);
sg_len++; sg_len++;
} while (remain); } 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) { list_for_each_entry(req, &packed->list, queuelist) {
sg_len += blk_rq_map_sg(mq->queue, req, __sg); sg_len += blk_rq_map_sg(mq->queue, req, __sg);
__sg = sg + (sg_len - 1); __sg = sg + (sg_len - 1);
(__sg++)->page_link &= ~0x02; sg_unmark_end(__sg++);
} }
sg_mark_end(sg + (sg_len - 1)); sg_mark_end(sg + (sg_len - 1));
return sg_len; return sg_len;