iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfsd: move sc_file assignment into alloc_init_deleg

Browse Source 
Take an easy chance to simplify the caller a little.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
This commit is contained in:
J. Bruce Fields 2018-02-21 15:27:28 -05:00
parent 0af6e690f0
commit 86d29b10eb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/nfsd/nfs4state.c
View File

@ -807,7 +807,8 @@ static void block_delegations(struct knfsd_fh *fh)
} }
static struct nfs4_delegation * static struct nfs4_delegation *
alloc_init_deleg(struct nfs4_client *clp, struct svc_fh *current_fh, alloc_init_deleg(struct nfs4_client *clp, struct nfs4_file *fp,
struct svc_fh *current_fh,
struct nfs4_clnt_odstate *odstate) struct nfs4_clnt_odstate *odstate)
{ {
struct nfs4_delegation *dp; struct nfs4_delegation *dp;
@ -838,6 +839,8 @@ alloc_init_deleg(struct nfs4_client *clp, struct svc_fh *current_fh,
dp->dl_retries = 1; dp->dl_retries = 1;
nfsd4_init_cb(&dp->dl_recall, dp->dl_stid.sc_client, nfsd4_init_cb(&dp->dl_recall, dp->dl_stid.sc_client,
&nfsd4_cb_recall_ops, NFSPROC4_CLNT_CB_RECALL); &nfsd4_cb_recall_ops, NFSPROC4_CLNT_CB_RECALL);
get_nfs4_file(fp);
dp->dl_stid.sc_file = fp;
return dp; return dp;
out_dec: out_dec:
atomic_long_dec(&num_delegations); atomic_long_dec(&num_delegations);
@ -4400,13 +4403,10 @@ nfs4_set_delegation(struct nfs4_client *clp, struct svc_fh *fh,
if (status) if (status)
return ERR_PTR(status); return ERR_PTR(status);
dp = alloc_init_deleg(clp, fh, odstate); dp = alloc_init_deleg(clp, fp, fh, odstate);
if (!dp) if (!dp)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
get_nfs4_file(fp);
dp->dl_stid.sc_file = fp;
spin_lock(&state_lock); spin_lock(&state_lock);
spin_lock(&fp->fi_lock); spin_lock(&fp->fi_lock);
if (!fp->fi_deleg_file) { if (!fp->fi_deleg_file) {