summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4callback.c
diff options
context:
space:
mode:
authorJeff Layton <jlayton@primarydata.com>2014-10-01 14:05:22 +0200
committerJ. Bruce Fields <bfields@redhat.com>2014-10-01 18:28:01 +0200
commit34549ab09e62db9703811c6ed4715f2ffa1fd7fb (patch)
treee2fb1f1da30e316013984958efcfb2be6aadfaed /fs/nfsd/nfs4callback.c
parentNFSD: Implement SEEK (diff)
downloadlinux-34549ab09e62db9703811c6ed4715f2ffa1fd7fb.tar.xz
linux-34549ab09e62db9703811c6ed4715f2ffa1fd7fb.zip
nfsd: eliminate "to_delegation" define
We now have cb_to_delegation and to_delegation, which do the same thing and are defined separately in different .c files. Move the cb_to_delegation definition into a header file and eliminate the redundant to_delegation definition. Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Diffstat (limited to 'fs/nfsd/nfs4callback.c')
-rw-r--r--fs/nfsd/nfs4callback.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 4fe4be1ee82e..ed2b1151b171 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -49,9 +49,6 @@ static void nfsd4_mark_cb_fault(struct nfs4_client *, int reason);
/* Index of predefined Linux callback client operations */
-#define to_delegation(cb) \
- container_of(cb, struct nfs4_delegation, dl_recall)
-
struct nfs4_cb_compound_hdr {
/* args */
u32 ident; /* minorversion 0 only */
@@ -491,7 +488,7 @@ static void nfs4_xdr_enc_cb_null(struct rpc_rqst *req, struct xdr_stream *xdr,
static void nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, struct xdr_stream *xdr,
const struct nfsd4_callback *cb)
{
- const struct nfs4_delegation *dp = to_delegation(cb);
+ const struct nfs4_delegation *dp = cb_to_delegation(cb);
struct nfs4_cb_compound_hdr hdr = {
.ident = cb->cb_clp->cl_cb_ident,
.minorversion = cb->cb_minorversion,