---

yaml --- r: 347639 b: refs/heads/master c: 698d8d8 h: refs/heads/master i: 347637: 6247967 347635: cf6dead 347631: 8a23dbf v: v3
git-mirror · Nov 10, 2012 · 29e4fd1 · 29e4fd1
1 parent ebdd439
commit 29e4fd1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 292a41716a4ad3e93c57155f99786abe8a8d386a
+refs/heads/master: 698d8d875a0593f65092f6619d97de49bc5caa45
diff --git a/trunk/fs/nfsd/nfs4recover.c b/trunk/fs/nfsd/nfs4recover.c
@@ -301,12 +301,13 @@ nfsd4_remove_clid_dir(struct nfs4_client *clp)
 
 	status = nfs4_save_creds(&original_cred);
 	if (status < 0)
-		goto out;
+		goto out_drop_write;
 
 	status = nfsd4_unlink_clid_dir(clp->cl_recdir, HEXDIR_LEN-1);
 	nfs4_reset_creds(original_cred);
 	if (status == 0)
 		vfs_fsync(rec_file, 0);
+out_drop_write:
 	mnt_drop_write_file(rec_file);
 out:
 	if (status)