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/auth.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'net/sunrpc/auth.c')
| -rw-r--r-- | net/sunrpc/auth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index 54a4e042f104..7535a7bed2fa 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c | |||
| @@ -332,9 +332,9 @@ rpcauth_lookup_credcache(struct rpc_auth *auth, struct auth_cred * acred, | |||
| 332 | list_add_tail(&new->cr_lru, &free); | 332 | list_add_tail(&new->cr_lru, &free); |
| 333 | spin_unlock(&cache->lock); | 333 | spin_unlock(&cache->lock); |
| 334 | found: | 334 | found: |
| 335 | if (test_bit(RPCAUTH_CRED_NEW, &cred->cr_flags) | 335 | if (test_bit(RPCAUTH_CRED_NEW, &cred->cr_flags) && |
| 336 | && cred->cr_ops->cr_init != NULL | 336 | cred->cr_ops->cr_init != NULL && |
| 337 | && !(flags & RPCAUTH_LOOKUP_NEW)) { | 337 | !(flags & RPCAUTH_LOOKUP_NEW)) { |
| 338 | int res = cred->cr_ops->cr_init(auth, cred); | 338 | int res = cred->cr_ops->cr_init(auth, cred); |
| 339 | if (res < 0) { | 339 | if (res < 0) { |
| 340 | put_rpccred(cred); | 340 | put_rpccred(cred); |