Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
file export-do_kern_mount.patch was initially added on branch b1_5.
[fs/lustre-release.git]
/
lustre
/
ptlbd
/
client.c
diff --git
a/lustre/ptlbd/client.c
b/lustre/ptlbd/client.c
index
b1d21e1
..
c44f955
100644
(file)
--- 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 (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);
}
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);
}
CERROR("PTLBD server UUID must be less than 38 characters\n");
RETURN(-EINVAL);
}
- obd_str2uuid(&ptlbd->bd_server_uuid, l
cfg->lcfg_inlbuf1
);
+ obd_str2uuid(&ptlbd->bd_server_uuid, l
ustre_cfg_string(lcfg, 1)
);
/*
* from client_obd_connect.. *shrug*
/*
* 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;
"ptlbd", &ptlbd->bd_client);
imp->imp_client = &ptlbd->bd_client;
imp->imp_obd = obd;
- memcpy(imp->imp_target_uuid.uuid, l
cfg->lcfg_inlbuf1
,
-
lcfg->lcfg_inllen1
);
+ memcpy(imp->imp_target_uuid.uuid, l
ustre_cfg_string(lcfg, 1)
,
+
LUSTRE_CFG_BUFLEN(lcfg, 1)
);
ptlbd_blk_register(ptlbd);
RETURN(0);
ptlbd_blk_register(ptlbd);
RETURN(0);