diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2008-02-07 23:10:21 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-02-10 18:11:16 -0500 |
commit | fbb7878c1a2ee40a1e983bf20f3dd3a80255dcf2 (patch) | |
tree | 9a03b3a15f105299bd3540dc20fb7e2c7953e29b | |
parent | c64e80d55db81df22a7f25b75ab4ba4c55db4749 (diff) | |
download | linux-stable-fbb7878c1a2ee40a1e983bf20f3dd3a80255dcf2.tar.gz linux-stable-fbb7878c1a2ee40a1e983bf20f3dd3a80255dcf2.tar.bz2 linux-stable-fbb7878c1a2ee40a1e983bf20f3dd3a80255dcf2.zip |
nfsd: clean up svc_reserve_auth()
This is a void function attempting to return the return value from
another void function, which seems harmless but extremely weird, and
apparently makes some compilers complain.
While we're there, clean up a little (e.g. the switch statement had a
minor style problem and seemed overkill as long as there's only one
case).
Thanks to Trond for noticing this.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r-- | include/linux/sunrpc/svc.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h index 64c771056187..64c97552964a 100644 --- a/include/linux/sunrpc/svc.h +++ b/include/linux/sunrpc/svc.h @@ -409,16 +409,13 @@ char * svc_print_addr(struct svc_rqst *, char *, size_t); * for all cases without actually generating the checksum, so we just use a * static value. */ -static inline void -svc_reserve_auth(struct svc_rqst *rqstp, int space) +static inline void svc_reserve_auth(struct svc_rqst *rqstp, int space) { - int added_space = 0; + int added_space = 0; - switch(rqstp->rq_authop->flavour) { - case RPC_AUTH_GSS: - added_space = RPC_MAX_AUTH_SIZE; - } - return svc_reserve(rqstp, space + added_space); + if (rqstp->rq_authop->flavour) + added_space = RPC_MAX_AUTH_SIZE; + svc_reserve(rqstp, space + added_space); } #endif /* SUNRPC_SVC_H */ |