Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...

[~andy/linux] / lib / scatterlist.c

diff --git a/lib/scatterlist.c b/lib/scatterlist.c
index b83c144d731f3707402be43e83d2041ab4df82b7..a1cf8cae60e70dd298735f4feab09e55f8141e16 100644 (file)
--- a/lib/scatterlist.c
+++ b/lib/scatterlist.c
@@ -401,7 +401,6 @@ void __sg_page_iter_start(struct sg_page_iter *piter,
        piter->__pg_advance = 0;
        piter->__nents = nents;
 
-       piter->page = NULL;
        piter->sg = sglist;
        piter->sg_pgoffset = pgoffset;
 }
@@ -426,7 +425,6 @@ bool __sg_page_iter_next(struct sg_page_iter *piter)
                if (!--piter->__nents || !piter->sg)
                        return false;
        }
-       piter->page = nth_page(sg_page(piter->sg), piter->sg_pgoffset);
 
        return true;
 }
@@ -496,7 +494,7 @@ bool sg_miter_next(struct sg_mapping_iter *miter)
                miter->__remaining = min_t(unsigned long, miter->__remaining,
                                           PAGE_SIZE - miter->__offset);
        }
-       miter->page = miter->piter.page;
+       miter->page = sg_page_iter_page(&miter->piter);
        miter->consumed = miter->length = miter->__remaining;
 
        if (miter->__flags & SG_MITER_ATOMIC)