summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2016-07-12 13:17:58 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2016-07-18 17:35:50 +0800
commit9fb5f6659dbe00c43848f007990bd7ce0debfd4e (patch)
treed31b23699f3ea7078b0b1e28c8e3c56d124e884f /crypto
parentc5b267afa79f6bae98516720325bf981facb235f (diff)
downloadlinux-crypto-9fb5f6659dbe00c43848f007990bd7ce0debfd4e.tar.gz
linux-crypto-9fb5f6659dbe00c43848f007990bd7ce0debfd4e.zip
crypto: scatterwalk - Remove unnecessary advance in scatterwalk_pagedone
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>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/scatterwalk.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c
index 52aae297..2ec5368e 100644
--- a/crypto/scatterwalk.c
+++ b/crypto/scatterwalk.c
@@ -62,12 +62,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)