aboutsummaryrefslogtreecommitdiff
path: root/fs/nfsd/nfs4state.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2009-09-15 18:07:35 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-09-15 20:49:34 -0400
commit80fc015bdfe1f5b870c1e1ee02d78e709523fee7 (patch)
treef56fd466add111a4c6bcc29d127325e3e77b4669 /fs/nfsd/nfs4state.c
parent29ab23cc5d351658d01a4327d55e9106a73fd04f (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.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 11db40cb2f2..0445192d660 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -696,10 +696,6 @@ shutdown_callback_client(struct nfs4_client *clp)
clp->cl_cb_conn.cb_client = NULL;
rpc_shutdown_client(clnt);
}
- if (clp->cl_cb_conn.cb_cred) {
- put_rpccred(clp->cl_cb_conn.cb_cred);
- clp->cl_cb_conn.cb_cred = NULL;
- }
}
static inline void
@@ -4020,7 +4016,7 @@ __nfs4_state_start(void)
return -ENOMEM;
queue_delayed_work(laundry_wq, &laundromat_work, grace_time);
set_max_delegations();
- return 0;
+ return set_callback_cred();
}
int