From: NeilBrown <neilb@cse.unsw.edu.au>
Date: Fri, 8 Jul 2005 00:59:10 +0000 (-0700)
Subject: [PATCH] nfsd4: reboot recovery fix
X-Git-Tag: v2.6.13-rc3~135
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=463090294e1e460cf97f5ade376d4b1e62bc5263;p=linux-2.6-omap-h63xx.git

[PATCH] nfsd4: reboot recovery fix

We need to remove the recovery directory here too.  (This chunk just got lost
somehow in the process of commuting the reboot recovery patches past the other
patches.)

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 89e36526d7f..9f9db40b566 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -874,6 +874,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, struct nfsd4_setclientid_confi
 			  * 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;