summaryrefslogtreecommitdiff
path: root/fs/lockd
diff options
context:
space:
mode:
authorStanislav Kinsbursky <skinsbursky@parallels.com>2012-09-18 13:37:18 +0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-10-01 15:27:38 -0700
commit303a7ce92064c285a04c870f2dc0192fdb2968cb (patch)
tree314e49df1536acc5b7752a1f8609392a13a890a8 /fs/lockd
parente9406db20fecbfcab646bad157b4cfdc7cadddfb (diff)
downloadlinux-3.10-303a7ce92064c285a04c870f2dc0192fdb2968cb.tar.gz
linux-3.10-303a7ce92064c285a04c870f2dc0192fdb2968cb.tar.bz2
linux-3.10-303a7ce92064c285a04c870f2dc0192fdb2968cb.zip
lockd: use rpc client's cl_nodename for id encoding
Taking hostname from uts namespace if not safe, because this cuold be performind during umount operation on child reaper death. And in this case current->nsproxy is NULL already. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Cc: <stable@vger.kernel.org> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/lockd')
-rw-r--r--fs/lockd/mon.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 38f240e104c..e0bc36e74ce 100644
--- a/fs/lockd/mon.c
+++ b/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);