Commit 8c812dca authored by Ben Hutchings's avatar Ben Hutchings

Revert "lockd: use rpc client's cl_nodename for id encoding"

This reverts 5ff39e97 which was commit
303a7ce9 upstream.

It is not necessary for kernel versions without per-netns RPC clients.
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 5bbeedc3
...@@ -40,7 +40,6 @@ struct nsm_args { ...@@ -40,7 +40,6 @@ struct nsm_args {
u32 proc; u32 proc;
char *mon_name; char *mon_name;
char *nodename;
}; };
struct nsm_res { struct nsm_res {
...@@ -94,7 +93,6 @@ static int nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res) ...@@ -94,7 +93,6 @@ static int nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res)
.vers = 3, .vers = 3,
.proc = NLMPROC_NSM_NOTIFY, .proc = NLMPROC_NSM_NOTIFY,
.mon_name = nsm->sm_mon_name, .mon_name = nsm->sm_mon_name,
.nodename = utsname()->nodename,
}; };
struct rpc_message msg = { struct rpc_message msg = {
.rpc_argp = &args, .rpc_argp = &args,
...@@ -431,7 +429,7 @@ static void encode_my_id(struct xdr_stream *xdr, const struct nsm_args *argp) ...@@ -431,7 +429,7 @@ static void encode_my_id(struct xdr_stream *xdr, const struct nsm_args *argp)
{ {
__be32 *p; __be32 *p;
encode_nsm_string(xdr, argp->nodename); encode_nsm_string(xdr, utsname()->nodename);
p = xdr_reserve_space(xdr, 4 + 4 + 4); p = xdr_reserve_space(xdr, 4 + 4 + 4);
*p++ = cpu_to_be32(argp->prog); *p++ = cpu_to_be32(argp->prog);
*p++ = cpu_to_be32(argp->vers); *p++ = cpu_to_be32(argp->vers);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment