summaryrefslogtreecommitdiffstats
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-03-20 06:07:08 +0100
committerRusty Russell <rusty@rustcorp.com.au>2013-03-20 06:13:04 +0100
commitc8164d8931fdee9ac5314708c4071adf1d997425 (patch)
treec5d71c82defa52fc3afe7d14e61f44cbb6ff7dc7 /block/blk-merge.c
parentcaif_virtio: Introduce caif over virtio (diff)
downloadlinux-c8164d8931fdee9ac5314708c4071adf1d997425.tar.xz
linux-c8164d8931fdee9ac5314708c4071adf1d997425.zip
scatterlist: introduce sg_unmark_end
This is useful in places that recycle the same scatterlist multiple times, and do not want to incur the cost of sg_init_table every time in hot paths. Acked-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'block/blk-merge.c')
-rw-r--r--block/blk-merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c
index 936a110de0b9..5f2448253797 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -143,7 +143,7 @@ new_segment:
* termination bit to avoid doing a full
* sg_init_table() in drivers for each command.
*/
- (*sg)->page_link &= ~0x02;
+ sg_unmark_end(*sg);
*sg = sg_next(*sg);
}