diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2012-01-23 13:52:01 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-01-27 13:59:15 -0500 |
| commit | e873088f2939dcd60721183ce6802515afc43ceb (patch) | |
| tree | 70ccd09d0a3866613651658aa6ac8621170f3063 /fs/nfsd | |
| parent | c692554bf4fe50a0187744663acc935d10e210a2 (diff) | |
| download | op-kernel-dev-e873088f2939dcd60721183ce6802515afc43ceb.zip op-kernel-dev-e873088f2939dcd60721183ce6802515afc43ceb.tar.gz | |
nfsd4: minor nfs4_setlease cleanup
As far as I can tell, this list is used only under the state lock, so we
may as well do this in the simpler order.
Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 5795d5f..ed3085b 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3043,18 +3043,18 @@ static int nfs4_setlease(struct nfs4_delegation *dp) if (!fl) return -ENOMEM; fl->fl_file = find_readable_file(fp); - list_add(&dp->dl_perclnt, &dp->dl_stid.sc_client->cl_delegations); status = vfs_setlease(fl->fl_file, fl->fl_type, &fl); - if (status) { - list_del_init(&dp->dl_perclnt); - locks_free_lock(fl); - return status; - } + if (status) + goto out_free; + list_add(&dp->dl_perclnt, &dp->dl_stid.sc_client->cl_delegations); fp->fi_lease = fl; fp->fi_deleg_file = get_file(fl->fl_file); atomic_set(&fp->fi_delegees, 1); list_add(&dp->dl_perfile, &fp->fi_delegations); return 0; +out_free: + locks_free_lock(fl); + return status; } static int nfs4_set_delegation(struct nfs4_delegation *dp, struct nfs4_file *fp) |
