crypto: scatterwalk - Remove unnecessary advance in scatterwalk_pagedone

Orabug: 25243093

The offset advance in scatterwalk_pagedone not only is unnecessary,
but it was also buggy when it was needed by scatterwalk_copychunks.
As the latter has long ago been fixed to call scatterwalk_advance
directly, we can remove this unnecessary offset adjustment.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
(cherry picked from commit 28cf86fafdd663cfcad3c5a5fe9869f1fa01b472)
Signed-off-by: Ethan Zhao <ethan.zhao@oracle.com>

diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c
index f285404cc215ad35d3c45a7946d881481159f9bd..bd0c8c065b85dd46e7d52dd31fd4d731946f1732 100644 (file)
--- a/crypto/scatterwalk.c
+++ b/crypto/scatterwalk.c
@@ -55,12 +55,8 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out,
                        flush_dcache_page(page);
        }
 
-       if (more) {
-               walk->offset += PAGE_SIZE - 1;
-               walk->offset &= PAGE_MASK;
-               if (walk->offset >= walk->sg->offset + walk->sg->length)
-                       scatterwalk_start(walk, sg_next(walk->sg));
-       }
+       if (more && walk->offset >= walk->sg->offset + walk->sg->length)
+               scatterwalk_start(walk, sg_next(walk->sg));
 }
 
 void scatterwalk_done(struct scatter_walk *walk, int out, int more)