land v0.9.1 on HEAD, in preparation for a 1.0.x branch

[fs/lustre-release.git] / lustre / ptlbd / server.c

diff --git a/lustre/ptlbd/server.c b/lustre/ptlbd/server.c
index d293a86..e159df0 100644 (file)
--- a/lustre/ptlbd/server.c
+++ b/lustre/ptlbd/server.c
@@ -52,12 +52,13 @@ static int ptlbd_sv_setup(struct obd_device *obddev, obd_count len, void *buf)
                 ptlrpc_init_svc(PTLBD_NEVENTS, PTLBD_NBUFS, PTLBD_BUFSIZE,
                                 PTLBD_MAXREQSIZE, PTLBD_REQUEST_PORTAL,
                                 PTLBD_REPLY_PORTAL,
-                                ptlbd_handle, "ptlbd_sv", obddev);
+                                ptlbd_handle, "ptlbd_sv", 
+                                obddev->obd_proc_entry);
 
         if (ptlbd->ptlbd_service == NULL) 
                 GOTO(out_filp, rc = -ENOMEM);
 
-        rc = ptlrpc_start_thread(obddev, ptlbd->ptlbd_service, "ptldb");
+        rc = ptlrpc_start_n_threads(obddev, ptlbd->ptlbd_service, 1, "ptldb");
         if (rc != 0) 
                 GOTO(out_thread, rc);
 
@@ -66,7 +67,6 @@ static int ptlbd_sv_setup(struct obd_device *obddev, obd_count len, void *buf)
         RETURN(0);
 
 out_thread:
-        ptlrpc_stop_all_threads(ptlbd->ptlbd_service);
         ptlrpc_unregister_service(ptlbd->ptlbd_service);
 out_filp:
         filp_close(ptlbd->filp, NULL);
@@ -98,11 +98,15 @@ static struct obd_ops ptlbd_sv_obd_ops = {
         o_disconnect:   class_disconnect,
 };
 
+static struct lprocfs_vars lprocfs_obd_vars[] = { {0} };
+static struct lprocfs_vars lprocfs_module_vars[] = { {0} };
+LPROCFS_INIT_VARS(ptlbd_sv, lprocfs_module_vars, lprocfs_obd_vars)
+
 int ptlbd_sv_init(void)
 {
         struct lprocfs_static_vars lvars;
 
-        lprocfs_init_vars(ptlbd,&lvars);
+        lprocfs_init_vars(ptlbd_sv,&lvars);
         return class_register_type(&ptlbd_sv_obd_ops, lvars.module_vars,
                                    OBD_PTLBD_SV_DEVICENAME);
 }