diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2007-10-31 12:06:37 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@carl.home.kernel.dk> | 2007-11-02 08:47:06 +0100 |
| commit | c46f2334c84c2b26baa64d42d75ddc5fab38c3dc (patch) | |
| tree | 4d7800effffe61bd3eaeae8f13e44466e4818b36 /net/sunrpc/auth_gss | |
| parent | 87ae9afdcada236d0a1b38ce2c465a65916961dc (diff) | |
| download | blackbird-op-linux-c46f2334c84c2b26baa64d42d75ddc5fab38c3dc.tar.gz blackbird-op-linux-c46f2334c84c2b26baa64d42d75ddc5fab38c3dc.zip | |
[SG] Get rid of __sg_mark_end()
sg_mark_end() overwrites the page_link information, but all users want
__sg_mark_end() behaviour where we just set the end bit. That is the most
natural way to use the sg list, since you'll fill it in and then mark the
end point.
So change sg_mark_end() to only set the termination bit. Add a sg_magic
debug check as well, and clear a chain pointer if it is set.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'net/sunrpc/auth_gss')
| -rw-r--r-- | net/sunrpc/auth_gss/gss_krb5_crypto.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c index ab7cbd6575c4..0dd792338fa9 100644 --- a/net/sunrpc/auth_gss/gss_krb5_crypto.c +++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c @@ -211,8 +211,8 @@ encryptor(struct scatterlist *sg, void *data) if (thislen == 0) return 0; - __sg_mark_end(&desc->infrags[desc->fragno - 1]); - __sg_mark_end(&desc->outfrags[desc->fragno - 1]); + sg_mark_end(&desc->infrags[desc->fragno - 1]); + sg_mark_end(&desc->outfrags[desc->fragno - 1]); ret = crypto_blkcipher_encrypt_iv(&desc->desc, desc->outfrags, desc->infrags, thislen); @@ -293,7 +293,7 @@ decryptor(struct scatterlist *sg, void *data) if (thislen == 0) return 0; - __sg_mark_end(&desc->frags[desc->fragno - 1]); + sg_mark_end(&desc->frags[desc->fragno - 1]); ret = crypto_blkcipher_decrypt_iv(&desc->desc, desc->frags, desc->frags, thislen); |
