1 files changed, 6 insertions, 2 deletions

diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index 8025d646ab30..61c2e396f2fa 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -1354,8 +1354,9 @@ new_segment:
                         else
                                 sg = sg_next(sg);
 
-                        memset(sg, 0, sizeof(*sg));
-                        sg->page = bvec->bv_page;
+                        sg_dma_len(sg) = 0;
+                        sg_dma_address(sg) = 0;
+                        sg_set_page(sg, bvec->bv_page);
                         sg->length = nbytes;
                         sg->offset = bvec->bv_offset;
                         nsegs++;
@@ -1363,6 +1364,9 @@ new_segment:
                 bvprv = bvec;
         } /* segments in rq */
 
+        if (sg)
+                __sg_mark_end(sg);
+
         return nsegs;
 }