Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da81ed16 authored by Dan Williams's avatar Dan Williams Committed by Jens Axboe
Browse files

scatterlist: remove open coded sg_unmark_end instances 



Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
[hch: split from a larger patch by Dan]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent c56f6d12

block/blk-merge.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/mmc/card/queue.c

+2 −2
Original line number Diff line number Diff line
@@ -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;