aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2009-04-29 13:45:36 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-04-29 16:44:34 -0400
commitf64f79ea5f5e02ba8585f35a10b4a3bcab0cea52 (patch)
tree0b78de112c3a015c3f719064d1fa86583c7d5f0b /fs
parentb8fd47aefa5f13df1edacbc7e68d9874635109e5 (diff)
downloadkernel_samsung_tuna-f64f79ea5f5e02ba8585f35a10b4a3bcab0cea52.zip
kernel_samsung_tuna-f64f79ea5f5e02ba8585f35a10b4a3bcab0cea52.tar.gz
kernel_samsung_tuna-f64f79ea5f5e02ba8585f35a10b4a3bcab0cea52.tar.bz2
nfsd4: setclientid_confirm callback-change fixes
This setclientid_confirm case should allow the client to change callbacks, but it currently has a dummy implementation that just turns off callbacks completely. That dummy implementation isn't completely correct either, though: - There's no need to remove any client recovery directory in this case. - New clientid confirm verifiers should be generated (and returned) in setclientid; there's no need to generate a new one here. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/nfs4state.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index d24dd12..7e1fcc3 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1688,8 +1688,6 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
/* XXX: We just turn off callbacks until we can handle
* change request correctly. */
atomic_set(&conf->cl_callback.cb_set, 0);
- gen_confirm(conf);
- nfsd4_remove_clid_dir(unconf);
expire_client(unconf);
status = nfs_ok;