aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorNeilBrown <neilb@cse.unsw.edu.au>2005-07-07 20:59:13 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-07 21:24:08 -0400
commit67be431350941765e211eeed237c12def3aaba70 (patch)
tree58683397c9ab328f721d55b0d95f25e57dbcbda8 /fs/nfsd
parentcdc5524e8a257b1c91dd8e4cdfbab979f4e17a60 (diff)
[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>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4recover.c1
1 files changed, 1 insertions, 0 deletions
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)
316 if (!rec_dir_init || !clp->cl_firststate) 316 if (!rec_dir_init || !clp->cl_firststate)
317 return; 317 return;
318 318
319 clp->cl_firststate = 0;
319 nfs4_save_user(&uid, &gid); 320 nfs4_save_user(&uid, &gid);
320 status = nfsd4_unlink_clid_dir(clp->cl_recdir, HEXDIR_LEN-1); 321 status = nfsd4_unlink_clid_dir(clp->cl_recdir, HEXDIR_LEN-1);
321 nfs4_reset_user(uid, gid); 322 nfs4_reset_user(uid, gid);