diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2012-10-28 18:43:50 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-10-30 23:27:08 +0000 |
| commit | 8c812dca4d68f3c11e6f6d28cd8e92b4282909a6 (patch) | |
| tree | 1fb6c321916b25183ae587cbf681cd7c65f09a69 /fs | |
| parent | 5bbeedc3110bbb1b5c6b01fc1f027ab5d2eb40d6 (diff) | |
| download | linux-stable-8c812dca4d68f3c11e6f6d28cd8e92b4282909a6.tar.gz linux-stable-8c812dca4d68f3c11e6f6d28cd8e92b4282909a6.tar.bz2 linux-stable-8c812dca4d68f3c11e6f6d28cd8e92b4282909a6.zip | |
Revert "lockd: use rpc client's cl_nodename for id encoding"
This reverts 5ff39e971c87ea9f4c4c7b253898abafa960e32b which was commit
303a7ce92064c285a04c870f2dc0192fdb2968cb upstream.
It is not necessary for kernel versions without per-netns RPC clients.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/lockd/mon.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c index df753a1cb4b6..23d7451b2938 100644 --- a/fs/lockd/mon.c +++ b/fs/lockd/mon.c @@ -40,7 +40,6 @@ struct nsm_args { u32 proc; char *mon_name; - char *nodename; }; struct nsm_res { @@ -94,7 +93,6 @@ 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, @@ -431,7 +429,7 @@ static void encode_my_id(struct xdr_stream *xdr, const struct nsm_args *argp) { __be32 *p; - encode_nsm_string(xdr, argp->nodename); + encode_nsm_string(xdr, utsname()->nodename); p = xdr_reserve_space(xdr, 4 + 4 + 4); *p++ = cpu_to_be32(argp->prog); *p++ = cpu_to_be32(argp->vers); |