diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /net/sunrpc/svcauth.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'net/sunrpc/svcauth.c')
| -rw-r--r-- | net/sunrpc/svcauth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/svcauth.c b/net/sunrpc/svcauth.c index e64109b02aee..4e9393c24687 100644 --- a/net/sunrpc/svcauth.c +++ b/net/sunrpc/svcauth.c | |||
| @@ -46,8 +46,8 @@ svc_authenticate(struct svc_rqst *rqstp, __be32 *authp) | |||
| 46 | dprintk("svc: svc_authenticate (%d)\n", flavor); | 46 | dprintk("svc: svc_authenticate (%d)\n", flavor); |
| 47 | 47 | ||
| 48 | spin_lock(&authtab_lock); | 48 | spin_lock(&authtab_lock); |
| 49 | if (flavor >= RPC_AUTH_MAXFLAVOR || !(aops = authtab[flavor]) | 49 | if (flavor >= RPC_AUTH_MAXFLAVOR || !(aops = authtab[flavor]) || |
| 50 | || !try_module_get(aops->owner)) { | 50 | !try_module_get(aops->owner)) { |
| 51 | spin_unlock(&authtab_lock); | 51 | spin_unlock(&authtab_lock); |
| 52 | *authp = rpc_autherr_badcred; | 52 | *authp = rpc_autherr_badcred; |
| 53 | return SVC_DENIED; | 53 | return SVC_DENIED; |