diff options
| author |   Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-21 10:12:39 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-21 10:12:39 -0400 |
| commit | b3f87b98aa3dc22cc58f970140113b270015cddb (patch) | |
| tree | c4aec5996567ad96310f61e9244e799f41bf2625 /fs/nfs/nfs4proc.c | |
| parent | NFSv4.1 resend LAYOUTGET on data server invalid layout errors (diff) | |
| parent | sunrpc: fix loss of task->tk_status after rpc_delay call in xprt_alloc_slot (diff) | |
| download | linux-dev-b3f87b98aa3dc22cc58f970140113b270015cddb.tar.xz linux-dev-b3f87b98aa3dc22cc58f970140113b270015cddb.zip | |
Merge branch 'bugfixes' into nfs-for-next
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 49eecd5d3a2d..78784e5ca4c1 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -5094,10 +5094,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); |