Commit 650ecc8f authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

nfsd: remove dl_fh field from struct nfs4_delegation 



Now that the nfs4_file has a filehandle in it, we no longer need to
keep a per-delegation copy of it. Switch to using the one in the
nfs4_file instead.

Signed-off-by: default avatarJeff Layton <jlayton@primarydata.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent f54fe962

fs/nfsd/nfs4callback.c

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static void encode_cb_recall4args(struct xdr_stream *xdr, 
	p = xdr_reserve_space(xdr, 4);

	*p++ = xdr_zero;			/* truncate */



	encode_nfs_fh4(xdr, &dp->dl_fh);

	encode_nfs_fh4(xdr, &dp->dl_file->fi_fhandle);



	hdr->nops++;

}

fs/nfsd/nfs4state.c

+1 −2
Original line number Diff line number Diff line
@@ -604,7 +604,6 @@ alloc_init_deleg(struct nfs4_client *clp, struct svc_fh *current_fh) 
	INIT_LIST_HEAD(&dp->dl_perclnt);

	INIT_LIST_HEAD(&dp->dl_recall_lru);

	dp->dl_type = NFS4_OPEN_DELEGATE_READ;

	fh_copy_shallow(&dp->dl_fh, &current_fh->fh_handle);

	INIT_WORK(&dp->dl_recall.cb_work, nfsd4_run_cb_recall);

	return dp;

out_dec:
@@ -3097,7 +3096,7 @@ void nfsd4_prepare_cb_recall(struct nfs4_delegation *dp) 
	struct nfs4_client *clp = dp->dl_stid.sc_client;

	struct nfsd_net *nn = net_generic(clp->net, nfsd_net_id);



	block_delegations(&dp->dl_fh);

	block_delegations(&dp->dl_file->fi_fhandle);



	/*

	 * We can't do this in nfsd_break_deleg_cb because it is

fs/nfsd/state.h

+0 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ struct nfs4_delegation { 
	u32			dl_type;

	time_t			dl_time;

/* For recall: */

	struct knfsd_fh		dl_fh;

	int			dl_retries;

	struct nfsd4_callback	dl_recall;

};