Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Dan Williams and committed by
Jens Axboe
da81ed16 c56f6d12

+3 -3
+1 -1
block/blk-merge.c
··· 394 394 if (rq->cmd_flags & REQ_WRITE) 395 395 memset(q->dma_drain_buffer, 0, q->dma_drain_size); 396 396 397 - sg->page_link &= ~0x02; 397 + sg_unmark_end(sg); 398 398 sg = sg_next(sg); 399 399 sg_set_page(sg, virt_to_page(q->dma_drain_buffer), 400 400 q->dma_drain_size,
+2 -2
drivers/mmc/card/queue.c
··· 467 467 sg_set_buf(__sg, buf + offset, len); 468 468 offset += len; 469 469 remain -= len; 470 - (__sg++)->page_link &= ~0x02; 470 + sg_unmark_end(__sg++); 471 471 sg_len++; 472 472 } while (remain); 473 473 } ··· 475 475 list_for_each_entry(req, &packed->list, queuelist) { 476 476 sg_len += blk_rq_map_sg(mq->queue, req, __sg); 477 477 __sg = sg + (sg_len - 1); 478 - (__sg++)->page_link &= ~0x02; 478 + sg_unmark_end(__sg++); 479 479 } 480 480 sg_mark_end(sg + (sg_len - 1)); 481 481 return sg_len;