From 638dfd60cca6723e0b91e775f2028160489ebdf7 Mon Sep 17 00:00:00 2001
From: Stanislav Kinsbursky <skinsbursky@parallels.com>
Date: Tue, 18 Sep 2012 13:37:18 +0400
Subject: [PATCH] --- yaml --- r: 333169 b: refs/heads/master c:
 303a7ce92064c285a04c870f2dc0192fdb2968cb h: refs/heads/master i:   333167:
 a63610d6a2734d8975d0d24b60e7237a2125b0be v: v3

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

diff --git a/[refs] b/[refs]
index 70148fd6078f..dc755c6a819d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9406db20fecbfcab646bad157b4cfdc7cadddfb
+refs/heads/master: 303a7ce92064c285a04c870f2dc0192fdb2968cb
diff --git a/trunk/fs/lockd/mon.c b/trunk/fs/lockd/mon.c
index 38f240e104ce..e0bc36e74ceb 100644
--- a/trunk/fs/lockd/mon.c
+++ b/trunk/fs/lockd/mon.c
@@ -42,6 +42,7 @@ struct nsm_args {
 	u32			proc;
 
 	char			*mon_name;
+	char			*nodename;
 };
 
 struct nsm_res {
@@ -141,6 +142,7 @@ static int nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res,
 		.vers		= 3,
 		.proc		= NLMPROC_NSM_NOTIFY,
 		.mon_name	= nsm->sm_mon_name,
+		.nodename	= utsname()->nodename,
 	};
 	struct rpc_message msg = {
 		.rpc_argp	= &args,
@@ -477,7 +479,7 @@ static void encode_my_id(struct xdr_stream *xdr, const struct nsm_args *argp)
 {
 	__be32 *p;
 
-	encode_nsm_string(xdr, utsname()->nodename);
+	encode_nsm_string(xdr, argp->nodename);
 	p = xdr_reserve_space(xdr, 4 + 4 + 4);
 	*p++ = cpu_to_be32(argp->prog);
 	*p++ = cpu_to_be32(argp->vers);