[RFC PATCH 12/18] lockd: Convert the central lockd service to kthread_iterant API

@@ -122,58 +122,55 @@ static void restart_grace(void)
 }
 
 /*
- * This is the lockd kernel thread
+ * Lockd kernel thread implementation using the iterant API
+ * We don't terminate until the last NFS mount or NFS daemon
+ * has gone away.
  */
-static int
-lockd(void *vrqstp)
+static void lockd_sigkill(int sig)
 {
-	int		err = 0;
-	struct svc_rqst *rqstp = vrqstp;
-
-	/* try_to_freeze() is called from svc_recv() */
-	set_freezable();
+	restart_grace();
+}
 
+static void lockd_init(void *vrqstp)
+{
 	/* Allow SIGKILL to tell lockd to drop all of its locks */
-	allow_signal(SIGKILL);
+	kthread_sigaction(SIGKILL, lockd_sigkill);
 
 	dprintk("NFS locking service started (ver " LOCKD_VERSION ").\n");
+}
 
-	/*
-	 * The main request loop. We don't terminate until the last
-	 * NFS mount or NFS daemon has gone away.
-	 */
-	while (!kthread_should_stop()) {
-		long timeout = MAX_SCHEDULE_TIMEOUT;
-		RPC_IFDEBUG(char buf[RPC_MAX_ADDRBUFLEN]);
+static void lockd_func(void *vrqstp)
+{
+	int err = 0;
+	struct svc_rqst *rqstp = vrqstp;
 
-		/* update sv_maxconn if it has changed */
-		rqstp->rq_server->sv_maxconn = nlm_max_connections;
+	long timeout = MAX_SCHEDULE_TIMEOUT;
+	RPC_IFDEBUG(char buf[RPC_MAX_ADDRBUFLEN]);
 
-		if (signalled()) {
-			flush_signals(current);
-			restart_grace();
-			continue;
-		}
+	/* update sv_maxconn if it has changed */
+	rqstp->rq_server->sv_maxconn = nlm_max_connections;
 
-		timeout = nlmsvc_retry_blocked();
+	timeout = nlmsvc_retry_blocked();
 
-		/*
-		 * Find a socket with data available and call its
-		 * recvfrom routine.
-		 */
-		err = svc_recv(rqstp, timeout);
-		if (err == -EAGAIN || err == -EINTR)
-			continue;
-		dprintk("lockd: request from %s\n",
-				svc_print_addr(rqstp, buf, sizeof(buf)));
+	/*
+	 * Find a socket with data available and call its
+	 * recvfrom routine.
+	 */
+	err = svc_recv(rqstp, timeout);
+	if (err == -EAGAIN || err == -EINTR)
+		return;
 
-		svc_process(rqstp);
-	}
-	flush_signals(current);
+	dprintk("lockd: request from %s\n",
+		svc_print_addr(rqstp, buf, sizeof(buf)));
+
+	svc_process(rqstp);
+}
+
+static void lockd_destroy(void *vrqstp)
+{
 	if (nlmsvc_ops)
 		nlmsvc_invalidate_all();
 	nlm_shutdown_hosts();
-	return 0;
 }
 
 static int create_lockd_listener(struct svc_serv *serv, const char *name,

@@ -301,7 +298,14 @@ static int lockd_start_svc(struct svc_serv *serv)
 	svc_sock_update_bufs(serv);
 	serv->sv_maxconn = nlm_max_connections;
 
-	nlmsvc_task = kthread_create(lockd, nlmsvc_rqst, "%s", serv->sv_name);
+	nlmsvc_rqst->rq_kti.type = 0;
+	nlmsvc_rqst->rq_kti.data = nlmsvc_rqst;
+	nlmsvc_rqst->rq_kti.init = lockd_init;
+	nlmsvc_rqst->rq_kti.func = lockd_func;
+	nlmsvc_rqst->rq_kti.destroy = lockd_destroy;
+
+	nlmsvc_task = kthread_iterant_create(&nlmsvc_rqst->rq_kti,
+					     "%s", serv->sv_name);
 	if (IS_ERR(nlmsvc_task)) {
 		error = PTR_ERR(nlmsvc_task);
 		printk(KERN_WARNING

@@ -16,6 +16,7 @@
 #include <linux/sunrpc/xdr.h>
 #include <linux/sunrpc/auth.h>
 #include <linux/sunrpc/svcauth.h>
+#include <linux/kthread.h>
 #include <linux/wait.h>
 #include <linux/mm.h>
 

@@ -283,6 +284,7 @@ struct svc_rqst {
 	struct auth_domain *	rq_client;	/* RPC peer info */
 	struct auth_domain *	rq_gssclient;	/* "gss/"-style peer info */
 	struct svc_cacherep *	rq_cacherep;	/* cache info */
+	struct kthread_iterant  rq_kti;		/* info for iterant kthread */
 	struct task_struct	*rq_task;	/* service thread */
 	spinlock_t		rq_lock;	/* per-request lock */
 };