Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86d29b10 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd: move sc_file assignment into alloc_init_deleg 



Take an easy chance to simplify the caller a little.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
parent 0af6e690

fs/nfsd/nfs4state.c

+5 −5
Original line number Diff line number Diff line
@@ -807,7 +807,8 @@ static void block_delegations(struct knfsd_fh *fh) 
}



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_delegation *dp;
@@ -838,6 +839,8 @@ alloc_init_deleg(struct nfs4_client *clp, struct svc_fh *current_fh, 
	dp->dl_retries = 1;

	nfsd4_init_cb(&dp->dl_recall, dp->dl_stid.sc_client,

		      &nfsd4_cb_recall_ops, NFSPROC4_CLNT_CB_RECALL);

	get_nfs4_file(fp);

	dp->dl_stid.sc_file = fp;

	return dp;

out_dec:

	atomic_long_dec(&num_delegations);
@@ -4400,13 +4403,10 @@ nfs4_set_delegation(struct nfs4_client *clp, struct svc_fh *fh, 
	if (status)

		return ERR_PTR(status);



	dp = alloc_init_deleg(clp, fh, odstate);

	dp = alloc_init_deleg(clp, fp, fh, odstate);

	if (!dp)

		return ERR_PTR(-ENOMEM);



	get_nfs4_file(fp);

	dp->dl_stid.sc_file = fp;



	spin_lock(&state_lock);

	spin_lock(&fp->fi_lock);

	if (!fp->fi_deleg_file) {