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
LU-2110 mount: do not start osp twice
[fs/lustre-release.git]
/
lustre
/
obdclass
/
obd_mount.c
diff --git
a/lustre/obdclass/obd_mount.c
b/lustre/obdclass/obd_mount.c
index
4c82860
..
865b451
100644
(file)
--- a/
lustre/obdclass/obd_mount.c
+++ b/
lustre/obdclass/obd_mount.c
@@
-1286,6
+1286,9
@@
static int client_osp_config_process(const struct lu_env *env,
case LCFG_ADD_UUID: {
if (clli->cfg_flags == CFG_F_MARKER) {
rc = lustre_osp_setup(lcfg, lsi);
case LCFG_ADD_UUID: {
if (clli->cfg_flags == CFG_F_MARKER) {
rc = lustre_osp_setup(lcfg, lsi);
+ /* XXX: process only the first nid as
+ * we don't need another instance of osp */
+ clli->cfg_flags |= CFG_F_SKIP;
} else if (clli->cfg_flags == (CFG_F_MARKER | CFG_F_SKIP)) {
rc = class_add_uuid(lustre_cfg_string(lcfg, 1),
lcfg->lcfg_nid);
} else if (clli->cfg_flags == (CFG_F_MARKER | CFG_F_SKIP)) {
rc = class_add_uuid(lustre_cfg_string(lcfg, 1),
lcfg->lcfg_nid);