diff options
| author | Chuck Lever <cel@citi.umich.edu> | 2002-11-08 03:28:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-08 03:28:38 -0800 |
| commit | 44a15afe3dff7d44d64ed678c60719a63fad276e (patch) | |
| tree | df50f401b227783dc0efa99134c68bc6ac5f657f | |
| parent | ec213433101d668ff6f12830e3064c76ed515893 (diff) | |
[PATCH] use C99 static struct initializers
fix up the last remaining static struct initializers in the RPC client and
portmapper.
| -rw-r--r-- | include/linux/sunrpc/clnt.h | 7 | ||||
| -rw-r--r-- | net/sunrpc/pmap_clnt.c | 14 | ||||
| -rw-r--r-- | net/sunrpc/xprt.c | 7 |
3 files changed, 24 insertions, 4 deletions
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h index 17a46b575ba0..713cb3f4ea7e 100644 --- a/include/linux/sunrpc/clnt.h +++ b/include/linux/sunrpc/clnt.h @@ -130,7 +130,12 @@ void rpc_setbufsize(struct rpc_clnt *, unsigned int, unsigned int); static __inline__ int rpc_call(struct rpc_clnt *clnt, u32 proc, void *argp, void *resp, int flags) { - struct rpc_message msg = { proc, argp, resp, NULL }; + struct rpc_message msg = { + .rpc_proc = proc, + .rpc_argp = argp, + .rpc_resp = resp, + .rpc_cred = NULL + }; return rpc_call_sync(clnt, &msg, flags); } diff --git a/net/sunrpc/pmap_clnt.c b/net/sunrpc/pmap_clnt.c index 0706a62584ef..dc4fd4ae1133 100644 --- a/net/sunrpc/pmap_clnt.c +++ b/net/sunrpc/pmap_clnt.c @@ -42,7 +42,12 @@ rpc_getport(struct rpc_task *task, struct rpc_clnt *clnt) { struct rpc_portmap *map = &clnt->cl_pmap; struct sockaddr_in *sap = &clnt->cl_xprt->addr; - struct rpc_message msg = { PMAP_GETPORT, map, &clnt->cl_port, NULL }; + struct rpc_message msg = { + .rpc_proc = PMAP_GETPORT, + .rpc_argp = map, + .rpc_resp = &clnt->cl_port, + .rpc_cred = NULL + }; struct rpc_clnt *pmap_clnt; struct rpc_task *child; @@ -90,7 +95,12 @@ bailout: int rpc_getport_external(struct sockaddr_in *sin, __u32 prog, __u32 vers, int prot) { - struct rpc_portmap map = { prog, vers, prot, 0 }; + struct rpc_portmap map = { + .pm_prog = prog, + .pm_vers = vers, + .pm_prot = prot, + .pm_port = 0 + }; struct rpc_clnt *pmap_clnt; char hostname[32]; int status; diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 578e7752bcb9..cb37554a9bcb 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -905,7 +905,12 @@ tcp_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb, unsigned int offset, size_t len) { struct rpc_xprt *xprt = (struct rpc_xprt *)rd_desc->buf; - skb_reader_t desc = { skb, offset, len }; + skb_reader_t desc = { + .skb = skb, + .offset = offset, + .count = len, + .csum = 0 + }; dprintk("RPC: tcp_data_recv\n"); do { |