Commit bbf936ed authored by Jeff Layton's avatar Jeff Layton Committed by Chuck Lever
Browse files

NFSD: drop fh argument from alloc_init_deleg 



Currently, we pass the fh of the opened file down through several
functions so that alloc_init_deleg can pass it to delegation_blocked.
The filehandle of the open file is available in the nfs4_file however,
so there's no need to pass it in a separate argument.

Drop the argument from alloc_init_deleg, nfs4_open_delegation and
nfs4_set_delegation.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent a11ada99

fs/nfsd/nfs4state.c

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


static struct nfs4_delegation *

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;
@@ -1141,7 +1140,7 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_file *fp, 
	n = atomic_long_inc_return(&num_delegations);

	if (n < 0 || n > max_delegations)

		goto out_dec;

	if (delegation_blocked(&current_fh->fh_handle))

	if (delegation_blocked(&fp->fi_fhandle))

		goto out_dec;

	dp = delegstateid(nfs4_alloc_stid(clp, deleg_slab, nfs4_free_deleg));

	if (dp == NULL)
@@ -5290,7 +5289,7 @@ static int nfsd4_check_conflicting_opens(struct nfs4_client *clp, 
}



static struct nfs4_delegation *

nfs4_set_delegation(struct nfs4_client *clp, struct svc_fh *fh,

nfs4_set_delegation(struct nfs4_client *clp,

		    struct nfs4_file *fp, struct nfs4_clnt_odstate *odstate)

{

	int status = 0;
@@ -5335,7 +5334,7 @@ nfs4_set_delegation(struct nfs4_client *clp, struct svc_fh *fh, 
		return ERR_PTR(status);



	status = -ENOMEM;

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

	dp = alloc_init_deleg(clp, fp, odstate);

	if (!dp)

		goto out_delegees;
@@ -5403,8 +5402,7 @@ static void nfsd4_open_deleg_none_ext(struct nfsd4_open *open, int status) 
 * proper support for them.

 */

static void

nfs4_open_delegation(struct svc_fh *fh, struct nfsd4_open *open,

			struct nfs4_ol_stateid *stp)

nfs4_open_delegation(struct nfsd4_open *open, struct nfs4_ol_stateid *stp)

{

	struct nfs4_delegation *dp;

	struct nfs4_openowner *oo = openowner(stp->st_stateowner);
@@ -5436,7 +5434,7 @@ nfs4_open_delegation(struct svc_fh *fh, struct nfsd4_open *open, 
		default:

			goto out_no_deleg;

	}

	dp = nfs4_set_delegation(clp, fh, stp->st_stid.sc_file, stp->st_clnt_odstate);

	dp = nfs4_set_delegation(clp, stp->st_stid.sc_file, stp->st_clnt_odstate);

	if (IS_ERR(dp))

		goto out_no_deleg;
@@ -5568,7 +5566,7 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf 
	* Attempt to hand out a delegation. No error return, because the

	* OPEN succeeds even if we fail.

	*/

	nfs4_open_delegation(current_fh, open, stp);

	nfs4_open_delegation(open, stp);

nodeleg:

	status = nfs_ok;

	trace_nfsd_open(&stp->st_stid.sc_stateid);