AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] knfsd: lockd: make the nsm upcalls use the nsm_handle

Browse Source 
This converts the statd upcalls to use the nsm_handle

This means that we only register each host once with statd, rather than
registering each host/vers/protocol triple.

Signed-off-by: Olaf Kirch <okir@suse.de>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Olaf Kirch 2006-10-04 02:15:56 -07:00 committed by Linus Torvalds
parent 5c8dd29ca7
commit 9502c52259
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fs/lockd/mon.c
View File

@ -30,7 +30,7 @@ u32 nsm_local_state;
* Common procedure for SM_MON/SM_UNMON calls * Common procedure for SM_MON/SM_UNMON calls
*/ */
static int static int
nsm_mon_unmon(struct nlm_host *host, u32 proc, struct nsm_res *res) 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;
@ -46,10 +46,10 @@ nsm_mon_unmon(struct nlm_host *host, u32 proc, struct nsm_res *res)
goto out; goto out;
} }
args.addr = host->h_addr.sin_addr.s_addr; memset(&args, 0, sizeof(args));
args.proto= (host->h_proto<<1) | host->h_server; args.addr = nsm->sm_addr.sin_addr.s_addr;
args.prog = NLM_PROGRAM; args.prog = NLM_PROGRAM;
args.vers = host->h_version; args.vers = 3;
args.proc = NLMPROC_NSM_NOTIFY; args.proc = NLMPROC_NSM_NOTIFY;
memset(res, 0, sizeof(*res)); memset(res, 0, sizeof(*res));
@ -80,7 +80,7 @@ nsm_monitor(struct nlm_host *host)
if (nsm->sm_monitored) if (nsm->sm_monitored)
return 0; return 0;
status = nsm_mon_unmon(host, SM_MON, &res); status = nsm_mon_unmon(nsm, SM_MON, &res);
if (status < 0 || res.status != 0) if (status < 0 || res.status != 0)
printk(KERN_NOTICE "lockd: cannot monitor %s\n", host->h_name); printk(KERN_NOTICE "lockd: cannot monitor %s\n", host->h_name);
@ -99,16 +99,20 @@ nsm_unmonitor(struct nlm_host *host)
struct nsm_res res; struct nsm_res res;
int status = 0; int status = 0;
dprintk("lockd: nsm_unmonitor(%s)\n", host->h_name);
if (nsm == NULL) if (nsm == NULL)
return 0; return 0;
host->h_nsmhandle = NULL; host->h_nsmhandle = NULL;
if (!host->h_killed) { if (atomic_read(&nsm->sm_count) == 1
status = nsm_mon_unmon(host, SM_UNMON, &res); && nsm->sm_monitored && !nsm->sm_sticky) {
dprintk("lockd: nsm_unmonitor(%s)\n", host->h_name);
status = nsm_mon_unmon(nsm, SM_UNMON, &res);
if (status < 0) if (status < 0)
printk(KERN_NOTICE "lockd: cannot unmonitor %s\n", host->h_name); printk(KERN_NOTICE "lockd: cannot unmonitor %s\n",
nsm->sm_monitored = 0; host->h_name);
else
nsm->sm_monitored = 0;
} }
nsm_release(nsm); nsm_release(nsm);
return status; return status;
@ -171,9 +175,11 @@ xdr_encode_mon(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp)
p = xdr_encode_common(rqstp, p, argp); p = xdr_encode_common(rqstp, p, argp);
if (IS_ERR(p)) if (IS_ERR(p))
return PTR_ERR(p); return PTR_ERR(p);
/* Surprise - there may even be room for an IPv6 address now */
*p++ = argp->addr; *p++ = argp->addr;
*p++ = argp->vers; *p++ = 0;
*p++ = argp->proto; *p++ = 0;
*p++ = 0; *p++ = 0;
rqstp->rq_slen = xdr_adjust_iovec(rqstp->rq_svec, p); rqstp->rq_slen = xdr_adjust_iovec(rqstp->rq_svec, p);
return 0; return 0;

1
include/linux/lockd/sm_inter.h
View File

@ -28,7 +28,6 @@ struct nsm_args {
u32 prog; /* RPC callback info */ u32 prog; /* RPC callback info */
u32 vers; u32 vers;
u32 proc; u32 proc;
u32 proto; /* protocol (udp/tcp) plus server/client flag */
}; };
/* /*