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

Commit 977faf39 authored by Olaf Kirch's avatar Olaf Kirch Committed by Linus Torvalds
Browse files

[PATCH] knfsd: hide use of lockd's h_monitored flag 



This patch moves all checks of the h_monitored flag into the
nsm_monitor/unmonitor functions.  A subsequent patch will replace the
mechanism by which we mark a host as being monitored.

There is still one occurence of h_monitored outside of mon.c and that is in
clntlock.c where we respond to a reboot.  The subsequent patch will modify
this too.

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 7b2b1fee

fs/lockd/clntproc.c

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl) 
	unsigned char fl_flags = fl->fl_flags;

	int status = -ENOLCK;



	if (!host->h_monitored && nsm_monitor(host) < 0) {

	if (nsm_monitor(host) < 0) {

		printk(KERN_NOTICE "lockd: failed to monitor %s\n",

					host->h_name);

		goto out;

fs/lockd/host.c

+6 −3
Original line number Diff line number Diff line
@@ -331,9 +331,12 @@ nlm_gc_hosts(void) 
			}

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

			*q = host->h_next;

			/* Don't unmonitor hosts that have been invalidated */

			if (host->h_monitored && !host->h_killed)



			/*

			 * Unmonitor unless host was invalidated (i.e. lockd restarted)

			 */

			nsm_unmonitor(host);



			if ((clnt = host->h_rpcclnt) != NULL) {

				if (atomic_read(&clnt->cl_users)) {

					printk(KERN_WARNING

fs/lockd/mon.c

+12 −7
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ nsm_monitor(struct nlm_host *host) 
	int		status;



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

	if (host->h_monitored)

		return 0;



	status = nsm_mon_unmon(host, SM_MON, &res);
@@ -91,15 +93,18 @@ int 
nsm_unmonitor(struct nlm_host *host)

{

	struct nsm_res	res;

	int		status;

	int		status = 0;



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

	if (!host->h_monitored)

		return 0;

	host->h_monitored = 0;



	if (!host->h_killed) {

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

		if (status < 0)

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

	else

		host->h_monitored = 0;

	}

	return status;

}

fs/lockd/svc4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, 


	/* Obtain host handle */

	if (!(host = nlmsvc_lookup_host(rqstp))

	 || (argp->monitor && !host->h_monitored && nsm_monitor(host) < 0))

	 || (argp->monitor && nsm_monitor(host) < 0))

		goto no_locks;

	*hostp = host;

fs/lockd/svcproc.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ nlmsvc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, 


	/* Obtain host handle */

	if (!(host = nlmsvc_lookup_host(rqstp))

	 || (argp->monitor && !host->h_monitored && nsm_monitor(host) < 0))

	 || (argp->monitor && nsm_monitor(host) < 0))

		goto no_locks;

	*hostp = host;