mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-05 18:39:59 +00:00
Code Issues Releases Wiki Activity

nfsd: remove dl_fh field from struct nfs4_delegation

Browse source 
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: Jeff Layton <jlayton@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Jeff Layton 2014-07-25 07:34:27 -04:00 committed by J. Bruce Fields
parent f54fe962b8
commit 650ecc8f8f
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/nfsd/nfs4callback.c
View file

@ -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++;
}

3
fs/nfsd/nfs4state.c
View file

@ -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

1
fs/nfsd/state.h
View file

@ -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;
};