X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlbd%2Fclient.c;h=c44f9552c3a314e7f7a231b1207e1f75fe7f7cb5;hb=e52a140eb7f65a63f07dbb7e2aaff7f9e22974f2;hp=6a1d759527404a44894bf7863ffcc0f120b86944;hpb=9d4b898b1c1c7c318fda5f0c345ed726c774c06a;p=fs%2Flustre-release.git

diff --git a/lustre/ptlbd/client.c b/lustre/ptlbd/client.c
index 6a1d759..c44f955 100644
--- a/lustre/ptlbd/client.c
+++ b/lustre/ptlbd/client.c
@@ -55,17 +55,17 @@ static int ptlbd_cl_setup(struct obd_device *obd, obd_count len, void *buf)
         if (ptlbd->bd_import != NULL)
                 RETURN(-EALREADY);
 
-        if (lcfg->lcfg_inllen1 < 1) {
+        if (LUSTRE_CFG_BUFLEN(lcfg, 1) < 1) {
                 CERROR("requires a PTLBD server UUID\n");
                 RETURN(-EINVAL);
         }
 
-        if (lcfg->lcfg_inllen1 > 37) {
+        if (LUSTRE_CFG_BUFLEN(lcfg, 1) > 37) {
                 CERROR("PTLBD server UUID must be less than 38 characters\n");
                 RETURN(-EINVAL);
         }
 
-        obd_str2uuid(&ptlbd->bd_server_uuid, lcfg->lcfg_inlbuf1);
+        obd_str2uuid(&ptlbd->bd_server_uuid, lustre_cfg_string(lcfg, 1));
 
         /*
          * from client_obd_connect.. *shrug*
@@ -83,8 +83,8 @@ static int ptlbd_cl_setup(struct obd_device *obd, obd_count len, void *buf)
                         "ptlbd", &ptlbd->bd_client);
         imp->imp_client = &ptlbd->bd_client;
         imp->imp_obd = obd;
-        memcpy(imp->imp_target_uuid.uuid, lcfg->lcfg_inlbuf1,
-               lcfg->lcfg_inllen1);
+        memcpy(imp->imp_target_uuid.uuid, lustre_cfg_string(lcfg, 1),
+               LUSTRE_CFG_BUFLEN(lcfg, 1));
         ptlbd_blk_register(ptlbd);
 
         RETURN(0);
@@ -166,19 +166,20 @@ out_disco:
 
 
 /* modelled after ptlrpc_import_disconnect() */
-int ptlbd_cl_disconnect(struct obd_export *exp, int flags)
+int ptlbd_cl_disconnect(struct obd_export *exp, unsigned long flags)
 {
         struct obd_device *obd = exp->exp_obd;
         struct ptlbd_obd *ptlbd = &obd->u.ptlbd;
         struct obd_import *imp = ptlbd->bd_import;
         struct ptlrpc_request *request;
-        int rc, err;
+        int     rc, err;
         ENTRY;
 
         if (!obd)
                 RETURN(-EINVAL);
 
-        request = ptlrpc_prep_req(imp, LUSTRE_PBD_VERSION, PTLBD_DISCONNECT,
+        request = ptlrpc_prep_req(imp, LUSTRE_PBD_VERSION, 
+				  PTLBD_DISCONNECT,
                                   0, NULL, NULL);
         if (!request)
                 GOTO(out_req, rc = -ENOMEM);
@@ -235,7 +236,7 @@ int ptlbd_do_connect(struct ptlbd_obd *ptlbd)
         ENTRY;
 
         memset(&conn, 0, sizeof(conn));
-        rc = obd_connect(&conn, obd, &ptlbd->bd_server_uuid, 0);
+        rc = obd_connect(&conn, obd, &ptlbd->bd_server_uuid, NULL, 0);
         if (rc < 0)
                 RETURN(rc);
         ptlbd->bd_exp = class_conn2export(&conn);