Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nfsd: eliminate "to_delegation" define

Browse source 
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>
This commit is contained in:
Jeff Layton 2014-10-01 08:05:22 -04:00 • committed by J. Bruce Fields
parent 24bab49122
commit 34549ab09e
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/nfsd/nfs4callback.c
View file

@ -49,9 +49,6 @@ static void nfsd4_mark_cb_fault(struct nfs4_client *, int reason);
/* Index of predefined Linux callback client operations */ /* Index of predefined Linux callback client operations */
#define to_delegation(cb) \
container_of(cb, struct nfs4_delegation, dl_recall)
struct nfs4_cb_compound_hdr { struct nfs4_cb_compound_hdr {
/* args */ /* args */
u32 ident; /* minorversion 0 only */ 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, static void nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, struct xdr_stream *xdr,
const struct nfsd4_callback *cb) 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 = { struct nfs4_cb_compound_hdr hdr = {
.ident = cb->cb_clp->cl_cb_ident, .ident = cb->cb_clp->cl_cb_ident,
.minorversion = cb->cb_minorversion, .minorversion = cb->cb_minorversion,

3
fs/nfsd/nfs4state.c
View file

@ -3360,9 +3360,6 @@ nfs4_share_conflict(struct svc_fh *current_fh, unsigned int deny_type)
return ret; return ret;
} }
#define cb_to_delegation(cb) \
container_of(cb, struct nfs4_delegation, dl_recall)
static void nfsd4_cb_recall_prepare(struct nfsd4_callback *cb) static void nfsd4_cb_recall_prepare(struct nfsd4_callback *cb)
{ {
struct nfs4_delegation *dp = cb_to_delegation(cb); struct nfs4_delegation *dp = cb_to_delegation(cb);

3
fs/nfsd/state.h
View file

@ -132,6 +132,9 @@ struct nfs4_delegation {
struct nfsd4_callback dl_recall; struct nfsd4_callback dl_recall;
}; };
#define cb_to_delegation(cb) \
container_of(cb, struct nfs4_delegation, dl_recall)
/* client delegation callback info */ /* client delegation callback info */
struct nfs4_cb_conn { struct nfs4_cb_conn {
/* SETCLIENTID info */ /* SETCLIENTID info */