diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-09-15 18:07:35 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-09-15 20:49:34 -0400 |
commit | 80fc015bdfe1f5b870c1e1ee02d78e709523fee7 (patch) | |
tree | f56fd466add111a4c6bcc29d127325e3e77b4669 /fs/nfsd/nfs4state.c | |
parent | 29ab23cc5d351658d01a4327d55e9106a73fd04f (diff) |
nfsd4: use common rpc_cred for all callbacks
Callbacks are always made using the machine's identity, so we can use a
single auth_generic credential shared among callbacks to all clients and
let the rpc code take care of the rest.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
-rw-r--r-- | fs/nfsd/nfs4state.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 11db40cb2f2b..0445192d660d 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -696,10 +696,6 @@ shutdown_callback_client(struct nfs4_client *clp) | |||
696 | clp->cl_cb_conn.cb_client = NULL; | 696 | clp->cl_cb_conn.cb_client = NULL; |
697 | rpc_shutdown_client(clnt); | 697 | rpc_shutdown_client(clnt); |
698 | } | 698 | } |
699 | if (clp->cl_cb_conn.cb_cred) { | ||
700 | put_rpccred(clp->cl_cb_conn.cb_cred); | ||
701 | clp->cl_cb_conn.cb_cred = NULL; | ||
702 | } | ||
703 | } | 699 | } |
704 | 700 | ||
705 | static inline void | 701 | static inline void |
@@ -4020,7 +4016,7 @@ __nfs4_state_start(void) | |||
4020 | return -ENOMEM; | 4016 | return -ENOMEM; |
4021 | queue_delayed_work(laundry_wq, &laundromat_work, grace_time); | 4017 | queue_delayed_work(laundry_wq, &laundromat_work, grace_time); |
4022 | set_max_delegations(); | 4018 | set_max_delegations(); |
4023 | return 0; | 4019 | return set_callback_cred(); |
4024 | } | 4020 | } |
4025 | 4021 | ||
4026 | int | 4022 | int |