From 29e4fd11f978b3c6ac3fc400bb77893a2d2cc355 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Fri, 9 Nov 2012 15:31:53 -0500 Subject: [PATCH] --- yaml --- r: 347639 b: refs/heads/master c: 698d8d875a0593f65092f6619d97de49bc5caa45 h: refs/heads/master i: 347637: 624796730a66d9e7eff91e6cefa82a5f298ef6dd 347635: cf6dead86e25a5c2381029d93131db9ebbe16a04 347631: 8a23dbf717afdac500b7650f469cb5fd3c0a89fe v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4recover.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e30902b5e38a..721b0896a47d 100644 --- 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 index 43295d45cc2b..0f1e2e21f7d9 100644 --- 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)