b=4336

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

diff --git a/lustre/ptlbd/client.c b/lustre/ptlbd/client.c
index 1acac79..4b1c5ad 100644 (file)
--- a/lustre/ptlbd/client.c
+++ b/lustre/ptlbd/client.c
@@ -32,11 +32,24 @@
 #include <linux/lprocfs_status.h>
 #include <linux/obd_ptlbd.h>
 
+static int ptlbd_cl_attach(struct obd_device *obd, obd_count len, void *buf)
+{
+        struct lprocfs_static_vars lvars;
+
+        lprocfs_init_vars(ptlbd_cl, &lvars);
+        return lprocfs_obd_attach(obd, lvars.obd_vars);
+}
+
+static int ptlbd_cl_detach(struct obd_device *obd)
+{
+        return lprocfs_obd_detach(obd);
+}
+
 static int ptlbd_cl_setup(struct obd_device *obd, obd_count len, void *buf)
 {
         struct ptlbd_obd *ptlbd = &obd->u.ptlbd;
-        struct obd_import *imp;
         struct lustre_cfg* lcfg = buf;
+        struct obd_import *imp;
         ENTRY;
 
         if (ptlbd->bd_import != NULL)
@@ -66,11 +79,11 @@ static int ptlbd_cl_setup(struct obd_device *obd, obd_count len, void *buf)
         }
         imp->imp_state = LUSTRE_IMP_FULL;
 
-        ptlrpc_init_client(PTLBD_REQUEST_PORTAL, PTLBD_REPLY_PORTAL, 
+        ptlrpc_init_client(PTLBD_REQUEST_PORTAL, PTLBD_REPLY_PORTAL,
                         "ptlbd", &ptlbd->bd_client);
         imp->imp_client = &ptlbd->bd_client;
         imp->imp_obd = obd;
-        memcpy(imp->imp_target_uuid.uuid, lcfg->lcfg_inlbuf1, 
+        memcpy(imp->imp_target_uuid.uuid, lcfg->lcfg_inlbuf1,
                lcfg->lcfg_inllen1);
         ptlbd_blk_register(ptlbd);
 
@@ -98,10 +111,9 @@ static int ptlbd_cl_cleanup(struct obd_device *obd, int flags)
         RETURN(0);
 }
 
-
 /* modelled after ptlrpc_import_connect() */
 int ptlbd_cl_connect(struct lustre_handle *conn, struct obd_device *obd,
-                     struct obd_uuid *target_uuid)
+                     struct obd_uuid *target_uuid, unsigned long connect_flags)
 {
         struct ptlbd_obd *ptlbd = &obd->u.ptlbd;
         struct obd_import *imp = ptlbd->bd_import;
@@ -110,7 +122,7 @@ int ptlbd_cl_connect(struct lustre_handle *conn, struct obd_device *obd,
         int     rc, size[] = {sizeof(imp->imp_target_uuid),
                               sizeof(obd->obd_uuid),
                               sizeof(*conn)};
-        char *tmp[] = {imp->imp_target_uuid.uuid, 
+        char *tmp[] = {imp->imp_target_uuid.uuid,
                        obd->obd_uuid.uuid,
                        (char*)conn};
         ENTRY;
@@ -136,11 +148,11 @@ int ptlbd_cl_connect(struct lustre_handle *conn, struct obd_device *obd,
         if (rc)
                 GOTO(out_req, rc);
 
-        exp->exp_connection = ptlrpc_connection_addref(request->rq_connection);
+        exp->exp_connection = ptlrpc_connection_addref(imp->imp_connection);
 
         imp->imp_state = LUSTRE_IMP_FULL;
         imp->imp_remote_handle = request->rq_repmsg->handle;
-        
+
 out_req:
         ptlrpc_req_finished(request);
 out_disco:
@@ -185,11 +197,13 @@ out_req:
 
 
 static struct obd_ops ptlbd_cl_obd_ops = {
-        o_owner:        THIS_MODULE,
-        o_setup:        ptlbd_cl_setup,
-        o_cleanup:      ptlbd_cl_cleanup,
-        o_connect:      ptlbd_cl_connect,
-        o_disconnect:   ptlbd_cl_disconnect,
+        .o_owner        = THIS_MODULE,
+        .o_attach       = ptlbd_cl_attach,
+        .o_detach       = ptlbd_cl_detach,
+        .o_setup        = ptlbd_cl_setup,
+        .o_cleanup      = ptlbd_cl_cleanup,
+        .o_connect      = ptlbd_cl_connect,
+        .o_disconnect   = ptlbd_cl_disconnect,
 };
 
 static struct lprocfs_vars lprocfs_obd_vars[] = { {0} };
@@ -201,7 +215,7 @@ int ptlbd_cl_init(void)
         struct lprocfs_static_vars lvars;
 
         lprocfs_init_vars(ptlbd_cl,&lvars);
-        return class_register_type(&ptlbd_cl_obd_ops, lvars.module_vars,
+        return class_register_type(&ptlbd_cl_obd_ops, NULL, lvars.module_vars,
                                    OBD_PTLBD_CL_DEVICENAME);
 }
 
@@ -210,8 +224,6 @@ void ptlbd_cl_exit(void)
         class_unregister_type(OBD_PTLBD_CL_DEVICENAME);
 }
 
-
-
 int ptlbd_do_connect(struct ptlbd_obd *ptlbd)
 {
         int     rc;
@@ -220,7 +232,7 @@ int ptlbd_do_connect(struct ptlbd_obd *ptlbd)
         ENTRY;
 
         memset(&conn, 0, sizeof(conn));
-        rc = obd_connect(&conn, obd, &ptlbd->bd_server_uuid);
+        rc = obd_connect(&conn, obd, &ptlbd->bd_server_uuid, 0);
         if (rc < 0)
                 RETURN(rc);
         ptlbd->bd_exp = class_conn2export(&conn);