NSM: Use C99 structure initializer to initialize nsm_args

[firefly-linux-kernel-4.4.55.git] / fs / lockd / mon.c

diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 4e7e958e8f6753236832ed9ebd82f6bae0746899..6f6ff410341a198a8f2430db9800437f11ebe4a8 100644 (file)
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -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];
@@ -179,7 +179,7 @@ static __be32 *xdr_encode_mon_name(__be32 *p, struct nsm_args *argp)
 
        if (!nsm_use_hostnames) {
                snprintf(buffer, XDR_ADDRBUF_LEN,
-                        NIPQUAD_FMT, NIPQUAD(argp->addr));
+                        "%pI4", &argp->addr);
                name = buffer;
        }