summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4callback.c
diff options
context:
space:
mode:
authorJeff Layton <jlayton@primarydata.com>2014-07-25 13:34:27 +0200
committerJ. Bruce Fields <bfields@redhat.com>2014-07-29 20:49:58 +0200
commit650ecc8f8ff29a7f0990704f09df232b505b200d (patch)
tree310e573d7496999564f974b9e57b0a30332e99c0 /fs/nfsd/nfs4callback.c
parentnfsd: give block_delegation and delegation_blocked its own spinlock (diff)
downloadlinux-650ecc8f8ff29a7f0990704f09df232b505b200d.tar.xz
linux-650ecc8f8ff29a7f0990704f09df232b505b200d.zip
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: Jeff Layton <jlayton@primarydata.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4callback.c')
-rw-r--r--fs/nfsd/nfs4callback.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index c393d6ca3fce..e9813389687b 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -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++;
}