---

yaml --- r: 299907 b: refs/heads/master c: 3617e50 h: refs/heads/master i: 299905: f6ec935 299903: 908d2c3 v: v3
git-mirror · Apr 30, 2012 · 2d4d505 · 2d4d505
1 parent 50a9840
commit 2d4d505
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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);