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>

2 files changed, 2 insertions, 2 deletions

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index dabd221857e1..03cf7179e8ef 100644
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -110,7 +110,7 @@ new_segment:
                         if (!sg)
                                 sg = sglist;
                         else {
-                                sg->page_link &= ~0x02;
+                                sg_unmark_end(sg);
                                 sg = sg_next(sg);
                         }
 
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);
                 }