diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-05-01 23:50:00 (GMT) |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-05-01 23:50:00 (GMT) |
commit | b53d40c5070bffde1b2bcaf848412a50d8894794 (patch) | |
tree | 3f0e0f62997b437eb03678040393aa5e1fbfd315 /fs/nfsd/nfs4state.c | |
parent | c237dc0303bcf6f4cc2e0efe4fe4e341c6f34dac (diff) | |
download | linux-b53d40c5070bffde1b2bcaf848412a50d8894794.tar.xz |
nfsd4: eliminate struct nfs4_cb_recall
The nfs4_cb_recall struct is used only in nfs4_delegation, so its
pointer to the containing delegation is unnecessary--we could just use
container_of().
But there's no real reason to have this a separate struct at all--just
move these fields to nfs4_delegation.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
-rw-r--r-- | fs/nfsd/nfs4state.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index d7b5e6b..3e5345e 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -203,9 +203,8 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_stateid *stp, struct svc_f get_file(stp->st_vfs_file); dp->dl_vfs_file = stp->st_vfs_file; dp->dl_type = type; - dp->dl_recall.cbr_dp = NULL; - dp->dl_recall.cbr_ident = cb->cb_ident; - dp->dl_recall.cbr_trunc = 0; + dp->dl_ident = cb->cb_ident; + dp->dl_trunc = 0; dp->dl_stateid.si_boot = get_seconds(); dp->dl_stateid.si_stateownerid = current_delegid++; dp->dl_stateid.si_fileid = 0; |