Commit ec7e8cae authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Anna Schumaker

nfsd: use named initializers in PROC()

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 39d43f75
...@@ -346,16 +346,16 @@ static int nfsaclsvc_release_access(struct svc_rqst *rqstp, __be32 *p, ...@@ -346,16 +346,16 @@ static int nfsaclsvc_release_access(struct svc_rqst *rqstp, __be32 *p,
struct nfsd3_voidargs { int dummy; }; struct nfsd3_voidargs { int dummy; };
#define PROC(name, argt, rest, relt, cache, respsize) \ #define PROC(name, argt, rest, relt, cache, respsize) \
{ (svc_procfunc) nfsacld_proc_##name, \ { \
(kxdrproc_t) nfsaclsvc_decode_##argt##args, \ .pc_func = (svc_procfunc) nfsacld_proc_##name, \
(kxdrproc_t) nfsaclsvc_encode_##rest##res, \ .pc_decode = (kxdrproc_t) nfsaclsvc_decode_##argt##args, \
(kxdrproc_t) nfsaclsvc_release_##relt, \ .pc_encode = (kxdrproc_t) nfsaclsvc_encode_##rest##res, \
sizeof(struct nfsd3_##argt##args), \ .pc_release = (kxdrproc_t) nfsaclsvc_release_##relt, \
sizeof(struct nfsd3_##rest##res), \ .pc_argsize = sizeof(struct nfsd3_##argt##args), \
0, \ .pc_ressize = sizeof(struct nfsd3_##rest##res), \
cache, \ .pc_cachetype = cache, \
respsize, \ .pc_xdrressize = respsize, \
} }
#define ST 1 /* status*/ #define ST 1 /* status*/
#define AT 21 /* attributes */ #define AT 21 /* attributes */
......
...@@ -238,16 +238,16 @@ static int nfs3svc_release_getacl(struct svc_rqst *rqstp, __be32 *p, ...@@ -238,16 +238,16 @@ static int nfs3svc_release_getacl(struct svc_rqst *rqstp, __be32 *p,
struct nfsd3_voidargs { int dummy; }; struct nfsd3_voidargs { int dummy; };
#define PROC(name, argt, rest, relt, cache, respsize) \ #define PROC(name, argt, rest, relt, cache, respsize) \
{ (svc_procfunc) nfsd3_proc_##name, \ { \
(kxdrproc_t) nfs3svc_decode_##argt##args, \ .pc_func = (svc_procfunc) nfsd3_proc_##name, \
(kxdrproc_t) nfs3svc_encode_##rest##res, \ .pc_decode = (kxdrproc_t) nfs3svc_decode_##argt##args, \
(kxdrproc_t) nfs3svc_release_##relt, \ .pc_encode = (kxdrproc_t) nfs3svc_encode_##rest##res, \
sizeof(struct nfsd3_##argt##args), \ .pc_release = (kxdrproc_t) nfs3svc_release_##relt, \
sizeof(struct nfsd3_##rest##res), \ .pc_argsize = sizeof(struct nfsd3_##argt##args), \
0, \ .pc_ressize = sizeof(struct nfsd3_##rest##res), \
cache, \ .pc_cachetype = cache, \
respsize, \ .pc_xdrressize = respsize, \
} }
#define ST 1 /* status*/ #define ST 1 /* status*/
#define AT 21 /* attributes */ #define AT 21 /* attributes */
......
...@@ -1673,10 +1673,10 @@ static void svcxdr_init_encode(struct svc_rqst *rqstp, ...@@ -1673,10 +1673,10 @@ static void svcxdr_init_encode(struct svc_rqst *rqstp,
* COMPOUND call. * COMPOUND call.
*/ */
static __be32 static __be32
nfsd4_proc_compound(struct svc_rqst *rqstp, nfsd4_proc_compound(struct svc_rqst *rqstp, void *arg, void *res)
struct nfsd4_compoundargs *args,
struct nfsd4_compoundres *resp)
{ {
struct nfsd4_compoundargs *args = arg;
struct nfsd4_compoundres *resp = res;
struct nfsd4_op *op; struct nfsd4_op *op;
struct nfsd4_operation *opdesc; struct nfsd4_operation *opdesc;
struct nfsd4_compound_state *cstate = &resp->cstate; struct nfsd4_compound_state *cstate = &resp->cstate;
...@@ -2517,7 +2517,7 @@ struct nfsd4_voidargs { int dummy; }; ...@@ -2517,7 +2517,7 @@ struct nfsd4_voidargs { int dummy; };
static struct svc_procedure nfsd_procedures4[2] = { static struct svc_procedure nfsd_procedures4[2] = {
[NFSPROC4_NULL] = { [NFSPROC4_NULL] = {
.pc_func = (svc_procfunc) nfsd4_proc_null, .pc_func = nfsd4_proc_null,
.pc_encode = (kxdrproc_t) nfs4svc_encode_voidres, .pc_encode = (kxdrproc_t) nfs4svc_encode_voidres,
.pc_argsize = sizeof(struct nfsd4_voidargs), .pc_argsize = sizeof(struct nfsd4_voidargs),
.pc_ressize = sizeof(struct nfsd4_voidres), .pc_ressize = sizeof(struct nfsd4_voidres),
...@@ -2525,7 +2525,7 @@ static struct svc_procedure nfsd_procedures4[2] = { ...@@ -2525,7 +2525,7 @@ static struct svc_procedure nfsd_procedures4[2] = {
.pc_xdrressize = 1, .pc_xdrressize = 1,
}, },
[NFSPROC4_COMPOUND] = { [NFSPROC4_COMPOUND] = {
.pc_func = (svc_procfunc) nfsd4_proc_compound, .pc_func = nfsd4_proc_compound,
.pc_decode = (kxdrproc_t) nfs4svc_decode_compoundargs, .pc_decode = (kxdrproc_t) nfs4svc_decode_compoundargs,
.pc_encode = (kxdrproc_t) nfs4svc_encode_compoundres, .pc_encode = (kxdrproc_t) nfs4svc_encode_compoundres,
.pc_argsize = sizeof(struct nfsd4_compoundargs), .pc_argsize = sizeof(struct nfsd4_compoundargs),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment