Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9502c522 authored by Olaf Kirch's avatar Olaf Kirch Committed by Linus Torvalds
Browse files

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



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: default avatarOlaf Kirch <okir@suse.de>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5c8dd29c

fs/lockd/mon.c

+18 −12
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ u32 nsm_local_state; 
 * Common procedure for SM_MON/SM_UNMON calls

 */

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;

	int		status;
@@ -46,10 +46,10 @@ nsm_mon_unmon(struct nlm_host *host, u32 proc, struct nsm_res *res) 
		goto out;

	}



	args.addr = host->h_addr.sin_addr.s_addr;

	args.proto= (host->h_proto<<1) | host->h_server;

	memset(&args, 0, sizeof(args));

	args.addr = nsm->sm_addr.sin_addr.s_addr;

	args.prog = NLM_PROGRAM;

	args.vers = host->h_version;

	args.vers = 3;

	args.proc = NLMPROC_NSM_NOTIFY;

	memset(res, 0, sizeof(*res));
@@ -80,7 +80,7 @@ nsm_monitor(struct nlm_host *host) 
	if (nsm->sm_monitored)

		return 0;



	status = nsm_mon_unmon(host, SM_MON, &res);

	status = nsm_mon_unmon(nsm, SM_MON, &res);



	if (status < 0 || res.status != 0)

		printk(KERN_NOTICE "lockd: cannot monitor %s\n", host->h_name);
@@ -99,15 +99,19 @@ nsm_unmonitor(struct nlm_host *host) 
	struct nsm_res	res;

	int		status = 0;



	dprintk("lockd: nsm_unmonitor(%s)\n", host->h_name);

	if (nsm == NULL)

		return 0;

	host->h_nsmhandle = NULL;



	if (!host->h_killed) {

		status = nsm_mon_unmon(host, SM_UNMON, &res);

	if (atomic_read(&nsm->sm_count) == 1

	 && 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)

			printk(KERN_NOTICE "lockd: cannot unmonitor %s\n", host->h_name);

			printk(KERN_NOTICE "lockd: cannot unmonitor %s\n",

					host->h_name);

		else

			nsm->sm_monitored = 0;

	}

	nsm_release(nsm);
@@ -171,9 +175,11 @@ xdr_encode_mon(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp) 
	p = xdr_encode_common(rqstp, p, argp);

	if (IS_ERR(p))

		return PTR_ERR(p);



	/* Surprise - there may even be room for an IPv6 address now */

	*p++ = argp->addr;

	*p++ = argp->vers;

	*p++ = argp->proto;

	*p++ = 0;

	*p++ = 0;

	*p++ = 0;

	rqstp->rq_slen = xdr_adjust_iovec(rqstp->rq_svec, p);

	return 0;

include/linux/lockd/sm_inter.h

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ struct nsm_args { 
	u32		prog;		/* RPC callback info */

	u32		vers;

	u32		proc;

	u32		proto;		/* protocol (udp/tcp) plus server/client flag */

};



/*