luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfsd4: minor nfs4_setlease cleanup

Browse Source 
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>
This commit is contained in:
J. Bruce Fields 2012-01-23 13:52:01 -05:00
parent c692554bf4
commit e873088f29
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/nfsd/nfs4state.c
View File

@ -3043,18 +3043,18 @@ static int nfs4_setlease(struct nfs4_delegation *dp)
if (!fl) if (!fl)
return -ENOMEM; return -ENOMEM;
fl->fl_file = find_readable_file(fp); 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); status = vfs_setlease(fl->fl_file, fl->fl_type, &fl);
if (status) { if (status)
list_del_init(&dp->dl_perclnt); goto out_free;
locks_free_lock(fl); list_add(&dp->dl_perclnt, &dp->dl_stid.sc_client->cl_delegations);
return status;
}
fp->fi_lease = fl; fp->fi_lease = fl;
fp->fi_deleg_file = get_file(fl->fl_file); fp->fi_deleg_file = get_file(fl->fl_file);
atomic_set(&fp->fi_delegees, 1); atomic_set(&fp->fi_delegees, 1);
list_add(&dp->dl_perfile, &fp->fi_delegations); list_add(&dp->dl_perfile, &fp->fi_delegations);
return 0; return 0;
out_free:
locks_free_lock(fl);
return status;
} }
static int nfs4_set_delegation(struct nfs4_delegation *dp, struct nfs4_file *fp) static int nfs4_set_delegation(struct nfs4_delegation *dp, struct nfs4_file *fp)