[PATCH] use C99 static struct initializers

fix up the last remaining static struct initializers in the RPC client and
portmapper.

diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index 17a46b575ba0f8d300d115c66f1c26e10d710b74..713cb3f4ea7e878e1c99db0a62da20bceeae802e 100644 (file)
--- 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 0706a62584ef075a11768a974e9e53f142ddd758..dc4fd4ae1133d6724ef17195b4f3995077ba955d 100644 (file)
--- 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 578e7752bcb907570915e7eb1ad8a67d9cccc0c0..cb37554a9bcbb9e0bc48b4d82bf7b3532d79048c 100644 (file)
--- 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 {