NSM: Use C99 structure initializer to initialize nsm_args
Chuck Lever [Thu, 4 Dec 2008 19:20:23 +0000 (14:20 -0500)]
Clean up: Use a C99 structure initializer instead of open-coding the
initialization of nsm_args.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

fs/lockd/mon.c

index ffd3461..6f6ff41 100644 (file)
@@ -37,7 +37,13 @@ nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res)
 {
        struct rpc_clnt *clnt;
        int             status;
-       struct nsm_args args;
+       struct nsm_args args = {
+               .addr           = nsm_addr_in(nsm)->sin_addr.s_addr,
+               .prog           = NLM_PROGRAM,
+               .vers           = 3,
+               .proc           = NLMPROC_NSM_NOTIFY,
+               .mon_name       = nsm->sm_name,
+       };
        struct rpc_message msg = {
                .rpc_argp       = &args,
                .rpc_resp       = res,
@@ -49,12 +55,6 @@ nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res)
                goto out;
        }
 
-       memset(&args, 0, sizeof(args));
-       args.mon_name = nsm->sm_name;
-       args.addr = nsm_addr_in(nsm)->sin_addr.s_addr;
-       args.prog = NLM_PROGRAM;
-       args.vers = 3;
-       args.proc = NLMPROC_NSM_NOTIFY;
        memset(res, 0, sizeof(*res));
 
        msg.rpc_proc = &clnt->cl_procinfo[proc];