smash the HEAD with the contents of b_cmd. HEAD_PRE_CMD_SMASH and

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

diff --git a/lustre/ptlbd/server.c b/lustre/ptlbd/server.c
index f25b811..dbd75d9 100644 (file)
--- a/lustre/ptlbd/server.c
+++ b/lustre/ptlbd/server.c
@@ -36,10 +36,9 @@
 
 static int ptlbd_sv_already_setup = 1;
 
-static int ptlbd_sv_setup(struct obd_device *obd, obd_count len, void *buf)
+static int ptlbd_sv_setup(struct obd_device *obddev, obd_count len, void *buf)
 {
-        struct ptlbd_obd *ptlbd = &obd->u.ptlbd;
-        struct lprocfs_static_vars lvars;
+        struct ptlbd_obd *ptlbd = &obddev->u.ptlbd;
         int rc;
         ENTRY;
 
@@ -49,20 +48,17 @@ static int ptlbd_sv_setup(struct obd_device *obd, obd_count len, void *buf)
         if ( IS_ERR(ptlbd->filp) )
                 RETURN(PTR_ERR(ptlbd->filp));
 
-        lprocfs_init_vars(ptlbd_sv, &lvars);
-        lprocfs_obd_setup(obd, lvars.obd_vars);
-
         ptlbd->ptlbd_service =
                 ptlrpc_init_svc(PTLBD_NBUFS, PTLBD_BUFSIZE, PTLBD_MAXREQSIZE,
                                 PTLBD_REQUEST_PORTAL, PTLBD_REPLY_PORTAL,
                                 ptlbd_handle, "ptlbd_sv",
-                                obd->obd_proc_entry);
+                                obddev->obd_proc_entry);
 
-        if (ptlbd->ptlbd_service == NULL)
+        if (ptlbd->ptlbd_service == NULL) 
                 GOTO(out_filp, rc = -ENOMEM);
 
-        rc = ptlrpc_start_n_threads(obd, ptlbd->ptlbd_service, 1, "ptldb");
-        if (rc != 0)
+        rc = ptlrpc_start_n_threads(obddev, ptlbd->ptlbd_service, 1, "ptldb");
+        if (rc != 0) 
                 GOTO(out_thread, rc);
 
         ptlbd_sv_already_setup = 1;
@@ -73,14 +69,13 @@ out_thread:
         ptlrpc_unregister_service(ptlbd->ptlbd_service);
 out_filp:
         filp_close(ptlbd->filp, NULL);
-        lprocfs_obd_cleanup(obd);
 
         RETURN(rc);
 }
 
-static int ptlbd_sv_cleanup(struct obd_device *obd, int flags)
+static int ptlbd_sv_cleanup(struct obd_device *obddev, int flags)
 {
-        struct ptlbd_obd *ptlbd = &obd->u.ptlbd;
+        struct ptlbd_obd *ptlbd = &obddev->u.ptlbd;
         ENTRY;
 
         /* XXX check for state */
@@ -91,18 +86,15 @@ static int ptlbd_sv_cleanup(struct obd_device *obd, int flags)
                 filp_close(ptlbd->filp, NULL);
 
         ptlbd_sv_already_setup = 0;
-
-        lprocfs_obd_cleanup(obd);
-
         RETURN(0);
 }
 
 static struct obd_ops ptlbd_sv_obd_ops = {
-        .o_owner        = THIS_MODULE,
-        .o_setup        = ptlbd_sv_setup,
-        .o_cleanup      = ptlbd_sv_cleanup,
-        .o_connect      = class_connect,
-        .o_disconnect   = class_disconnect,
+        o_owner:        THIS_MODULE,
+        o_setup:        ptlbd_sv_setup,
+        o_cleanup:      ptlbd_sv_cleanup,
+        o_connect:      class_connect,
+        o_disconnect:   class_disconnect,
 };
 
 static struct lprocfs_vars lprocfs_obd_vars[] = { {0} };
@@ -114,7 +106,7 @@ int ptlbd_sv_init(void)
         struct lprocfs_static_vars lvars;
 
         lprocfs_init_vars(ptlbd_sv,&lvars);
-        return class_register_type(&ptlbd_sv_obd_ops, lvars.module_vars,
+        return class_register_type(&ptlbd_sv_obd_ops, NULL, lvars.module_vars,
                                    OBD_PTLBD_SV_DEVICENAME);
 }