diff options
author | Jeff Layton <jlayton@redhat.com> | 2012-11-09 15:31:53 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-11-10 14:52:03 -0500 |
commit | 698d8d875a0593f65092f6619d97de49bc5caa45 (patch) | |
tree | 16bf075704d07d401c0f4db9276b9f975864f3ef /fs | |
parent | 292a41716a4ad3e93c57155f99786abe8a8d386a (diff) |
nfsd: fix error handling in nfsd4_remove_clid_dir
If the credential save fails, then we'll leak our mnt_want_write_file
reference.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfsd/nfs4recover.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index 43295d45cc2..0f1e2e21f7d 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c | |||
@@ -301,12 +301,13 @@ nfsd4_remove_clid_dir(struct nfs4_client *clp) | |||
301 | 301 | ||
302 | status = nfs4_save_creds(&original_cred); | 302 | status = nfs4_save_creds(&original_cred); |
303 | if (status < 0) | 303 | if (status < 0) |
304 | goto out; | 304 | goto out_drop_write; |
305 | 305 | ||
306 | status = nfsd4_unlink_clid_dir(clp->cl_recdir, HEXDIR_LEN-1); | 306 | status = nfsd4_unlink_clid_dir(clp->cl_recdir, HEXDIR_LEN-1); |
307 | nfs4_reset_creds(original_cred); | 307 | nfs4_reset_creds(original_cred); |
308 | if (status == 0) | 308 | if (status == 0) |
309 | vfs_fsync(rec_file, 0); | 309 | vfs_fsync(rec_file, 0); |
310 | out_drop_write: | ||
310 | mnt_drop_write_file(rec_file); | 311 | mnt_drop_write_file(rec_file); |
311 | out: | 312 | out: |
312 | if (status) | 313 | if (status) |