From 5cefefcee5132b03299325f22520f43f07d907c5 Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Thu, 4 Dec 2008 14:20:23 -0500
Subject: [PATCH] --- yaml --- r: 127443 b: refs/heads/master c:
 a4846750f090702e2fb848ac4fe5827bcef34060 h: refs/heads/master i:   127441:
 cb3665345996fdeb7cdb400f7928443fe054b440   127439:
 2bd4ae51791b43f33a4ff212370d1ea2fe1b3ca8 v: v3

---
 [refs]               |  2 +-
 trunk/fs/lockd/mon.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 6f5de3c342f1..a53a0e61977b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afb03699dc0a920aed3322ad0e6895533941fb1e
+refs/heads/master: a4846750f090702e2fb848ac4fe5827bcef34060
diff --git a/trunk/fs/lockd/mon.c b/trunk/fs/lockd/mon.c
index ffd3461f75ef..6f6ff410341a 100644
--- a/trunk/fs/lockd/mon.c
+++ b/trunk/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];