diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2007-05-09 08:58:32 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2007-10-16 11:07:09 +0200 |
| commit | ab83407e9ee35a4972457aa487be6a7a21afd715 (patch) | |
| tree | 9429b3019046226083c85dd9867304aca1b0ca08 | |
| parent | 7e3da6c4b9a69f44b758b2c88190ac33ac4ea1a1 (diff) | |
| download | kernel-common-ab83407e9ee35a4972457aa487be6a7a21afd715.tar.gz kernel-common-ab83407e9ee35a4972457aa487be6a7a21afd715.tar.bz2 kernel-common-ab83407e9ee35a4972457aa487be6a7a21afd715.zip | |
crypto: don't pollute the global namespace with sg_next()
It's a subsystem function, prefix it as such.
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| -rw-r--r-- | crypto/digest.c | 2 | ||||
| -rw-r--r-- | crypto/scatterwalk.c | 2 | ||||
| -rw-r--r-- | crypto/scatterwalk.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/crypto/digest.c b/crypto/digest.c index 1bf7414aeb9e..e56de6748b15 100644 --- a/crypto/digest.c +++ b/crypto/digest.c @@ -77,7 +77,7 @@ static int update2(struct hash_desc *desc, if (!nbytes) break; - sg = sg_next(sg); + sg = scatterwalk_sg_next(sg); } return 0; diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c index 3052f6507f53..d6852c33cfb7 100644 --- a/crypto/scatterwalk.c +++ b/crypto/scatterwalk.c @@ -62,7 +62,7 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out, 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)); + scatterwalk_start(walk, scatterwalk_sg_next(walk->sg)); } } diff --git a/crypto/scatterwalk.h b/crypto/scatterwalk.h index 500a220ad908..9c73e37a42ce 100644 --- a/crypto/scatterwalk.h +++ b/crypto/scatterwalk.h @@ -20,7 +20,7 @@ #include "internal.h" -static inline struct scatterlist *sg_next(struct scatterlist *sg) +static inline struct scatterlist *scatterwalk_sg_next(struct scatterlist *sg) { return (++sg)->length ? sg : (void *)sg->page; } |