From: NeilBrown <neilb@cse.unsw.edu.au>
Date: Fri, 8 Jul 2005 00:59:13 +0000 (-0700)
Subject: [PATCH] nfsd4: prevent multiple unlinks of recovery directories
X-Git-Tag: MMI-PSA29.97-13-9~56894
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=67be431350941765e211eeed237c12def3aaba70;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

[PATCH] nfsd4: prevent multiple unlinks of recovery directories

Make sure we don't try to delete client recovery directories multiple times;
fixes some spurious error messages.

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/nfs4recover.c b/fs/nfsd/nfs4recover.c
index 53abb333732e..57ed50fe7f85 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -316,6 +316,7 @@ nfsd4_remove_clid_dir(struct nfs4_client *clp)
 	if (!rec_dir_init || !clp->cl_firststate)
 		return;
 
+	clp->cl_firststate = 0;
 	nfs4_save_user(&uid, &gid);
 	status = nfsd4_unlink_clid_dir(clp->cl_recdir, HEXDIR_LEN-1);
 	nfs4_reset_user(uid, gid);