diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /net/sunrpc/auth.c | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
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); |