Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

NSM: Encode the new "priv" cookie for NSMPROC_MON requests

Browse Source 
Pass the new "priv" cookie to NSMPROC_MON's XDR encoder, instead of
creating the "priv" argument in the encoder at call time.

This patch should not cause a behavioral change: the contents of the
cookie remain the same for the time being.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
Chuck Lever 2008-12-05 19:03:24 -05:00 committed by J. Bruce Fields
parent 7e44d3bea2
commit cab2d3c991
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/lockd/mon.c
View File

@ -31,7 +31,7 @@ enum {
}; };
struct nsm_args { struct nsm_args {
__be32 addr; /* remote address */ struct nsm_private *priv;
u32 prog; /* RPC callback info */ u32 prog; /* RPC callback info */
u32 vers; u32 vers;
u32 proc; u32 proc;
@ -101,7 +101,7 @@ nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res)
struct rpc_clnt *clnt; struct rpc_clnt *clnt;
int status; int status;
struct nsm_args args = { struct nsm_args args = {
.addr = nsm_addr_in(nsm)->sin_addr.s_addr, .priv = &nsm->sm_priv,
.prog = NLM_PROGRAM, .prog = NLM_PROGRAM,
.vers = 3, .vers = 3,
.proc = NLMPROC_NSM_NOTIFY, .proc = NLMPROC_NSM_NOTIFY,
@ -407,9 +407,6 @@ static int encode_mon_id(struct xdr_stream *xdr, const struct nsm_args *argp)
* The "priv" argument may contain private information required * The "priv" argument may contain private information required
* by the NSMPROC_MON call. This information will be supplied in the * by the NSMPROC_MON call. This information will be supplied in the
* NLMPROC_SM_NOTIFY call. * NLMPROC_SM_NOTIFY call.
*
* Linux provides the raw IP address of the monitored host,
* left in network byte order.
*/ */
static int encode_priv(struct xdr_stream *xdr, const struct nsm_args *argp) static int encode_priv(struct xdr_stream *xdr, const struct nsm_args *argp)
{ {
@ -418,10 +415,7 @@ static int encode_priv(struct xdr_stream *xdr, const struct nsm_args *argp)
p = xdr_reserve_space(xdr, SM_PRIV_SIZE); p = xdr_reserve_space(xdr, SM_PRIV_SIZE);
if (unlikely(p == NULL)) if (unlikely(p == NULL))
return -EIO; return -EIO;
*p++ = argp->addr; xdr_encode_opaque_fixed(p, argp->priv->data, SM_PRIV_SIZE);
*p++ = 0;
*p++ = 0;
*p++ = 0;
return 0; return 0;
} }