From 2d4d50543993d5c8f25a807041f1a16da83a2c19 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 30 Apr 2012 12:04:58 -0400
Subject: [PATCH] --- yaml --- r: 299907 b: refs/heads/master c:
 3617e5031b3acec04efaa36566a8111ac8f07325 h: refs/heads/master i:   299905:
 f6ec935142d8731627864e3a3d9e18f9aa73cac9   299903:
 908d2c30f17fde642dd672c2bcce31baf9d1d0f0 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nfs/nfs4proc.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index fcce02b6f7ca..f75316ec4e04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbbb34498f8b2b26cbdc79532c8a2ee5cd1e756a
+refs/heads/master: 3617e5031b3acec04efaa36566a8111ac8f07325
diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c
index 75eb883ed4ce..99650aaf8937 100644
--- a/trunk/fs/nfs/nfs4proc.c
+++ b/trunk/fs/nfs/nfs4proc.c
@@ -5122,10 +5122,9 @@ int nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred)
 	nfs4_construct_boot_verifier(clp, &verifier);
 
 	args.id_len = scnprintf(args.id, sizeof(args.id),
-				"%s/%s.%s/%u",
+				"%s/%s/%u",
 				clp->cl_ipaddr,
-				init_utsname()->nodename,
-				init_utsname()->domainname,
+				clp->cl_rpcclient->cl_nodename,
 				clp->cl_rpcclient->cl_auth->au_flavor);
 
 	res.server_scope = kzalloc(sizeof(struct server_scope), GFP_KERNEL);