From: J. Bruce Fields <bfields@citi.umich.edu>
Date: Wed, 29 Apr 2009 17:45:36 +0000 (-0400)
Subject: nfsd4: setclientid_confirm callback-change fixes
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~25738^2~34
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f64f79ea5f5e02ba8585f35a10b4a3bcab0cea52;p=mirror_ubuntu-artful-kernel.git

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>
---

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index d24dd12ddb4d..7e1fcc3aade4 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;