nfsd: eliminate "to_delegation" define
Subsystems (2)
PATCH 1/1 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.
--- fs/nfsd/nfs4callback.c | 5 +---- fs/nfsd/nfs4state.c | 3 --- fs/nfsd/state.h | 3 +++ 3 files changed, 4 insertions(+), 7 deletions(-)
fs/nfsd/nfs4callback.c +1 -4
@@ -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,
fs/nfsd/nfs4state.c +0 -3
@@ -3360,9 +3360,6 @@ nfs4_share_conflict(struct svc_fh *current_fh, unsigned int deny_type)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) {struct nfs4_delegation *dp =cb_to_delegation (cb);
fs/nfsd/state.h +3 -0
@@ -132,6 +132,9 @@ struct nfs4_delegation {struct nfsd4_callback dl_recall; }; +#define cb_to_delegation (cb) \ + container_of(cb, struct nfs4_delegation, dl_recall) +/* client delegation callback info */ struct nfs4_cb_conn {/* SETCLIENTID info */
Signature · 1 line
1.9.3
Quoted 7 lines · Jeff Layton
We now have
cb_to_delegationandto_delegation, which do the same thing and are defined separately in different .c files. Move thecb_to_delegationdefinition into a header file and eliminate the redundantto_delegationdefinition.Cc Christoph Hellwig <[email protected]>Signed-off-by Jeff Layton <[email protected]>
Looks good,
Quoted 6 lines · Christoph Hellwig
Quoted 5 lines · Jeff Layton
We now have
cb_to_delegationandto_delegation, which do the same thing and are defined separately in different .c files. Move thecb_to_delegationdefinition into a header file and eliminate the redundantto_delegationdefinition.
Quoted 6 lines
Quoted 2 lines
Cc Christoph Hellwig <[email protected]>Signed-off-by Jeff Layton <[email protected]>Looks good,
Reviewed-by Christoph Hellwig <[email protected]>
Got it, thanks.--b.