projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clk: asm9260: Migrate to clk_hw based registration and OF APIs
[deliverable/linux.git]
/
net
/
sunrpc
/
auth_generic.c
diff --git
a/net/sunrpc/auth_generic.c
b/net/sunrpc/auth_generic.c
index 54dd3fdead54b8813bb6cbdf769f96a11d8f49ea..168219535a341056c22679273771dcf7d7656f28 100644
(file)
--- a/
net/sunrpc/auth_generic.c
+++ b/
net/sunrpc/auth_generic.c
@@
-224,7
+224,7
@@
generic_key_timeout(struct rpc_auth *auth, struct rpc_cred *cred)
/* Fast track for non crkey_timeout (no key) underlying credentials */
/* Fast track for non crkey_timeout (no key) underlying credentials */
- if (
test_bit(RPC_CRED_NO_CRKEY_TIMEOUT, &acred->ac_flags)
)
+ if (
auth->au_flags & RPCAUTH_AUTH_NO_CRKEY_TIMEOUT
)
return 0;
/* Fast track for the normal case */
return 0;
/* Fast track for the normal case */
@@
-236,12
+236,6
@@
generic_key_timeout(struct rpc_auth *auth, struct rpc_cred *cred)
if (IS_ERR(tcred))
return -EACCES;
if (IS_ERR(tcred))
return -EACCES;
- if (!tcred->cr_ops->crkey_timeout) {
- set_bit(RPC_CRED_NO_CRKEY_TIMEOUT, &acred->ac_flags);
- ret = 0;
- goto out_put;
- }
-
/* Test for the almost error case */
ret = tcred->cr_ops->crkey_timeout(tcred);
if (ret != 0) {
/* Test for the almost error case */
ret = tcred->cr_ops->crkey_timeout(tcred);
if (ret != 0) {
@@
-257,7
+251,6
@@
generic_key_timeout(struct rpc_auth *auth, struct rpc_cred *cred)
set_bit(RPC_CRED_NOTIFY_TIMEOUT, &acred->ac_flags);
}
set_bit(RPC_CRED_NOTIFY_TIMEOUT, &acred->ac_flags);
}
-out_put:
put_rpccred(tcred);
return ret;
}
put_rpccred(tcred);
return ret;
}
This page took
0.026512 seconds
and
5
git commands to generate.