commit 67be431350941765e211eeed237c12def3aaba70
author NeilBrown <neilb@cse.unsw.edu.au> Thu Jul 07 17:59:13 2005 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu Jul 07 18:24:08 2005 -0700
tree 58683397c9ab328f721d55b0d95f25e57dbcbda8
parent cdc5524e8a257b1c91dd8e4cdfbab979f4e17a60

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

fs/nfsd/nfs4recover.c

diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index 53abb33..57ed50f 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -316,6 +316,7 @@
 	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);