From 8c95bfb0140ca5aadd3fe73a4f69d6b2373cc066 Mon Sep 17 00:00:00 2001 From: Alex Zhuravlev Date: Mon, 8 Oct 2012 23:31:20 +0400 Subject: [PATCH] LU-2110 mount: do not start osp twice failover nid can be added under the same marker as the main device setup block. so do not call lustre_osp_setup() on a subsequent LCFG_ADD_UUID command in the config. Signed-off-by: Alex Zhuravlev Change-Id: Ic4858812e942f73dd264dca5e33b27d51509f670 Reviewed-on: http://review.whamcloud.com/4227 Reviewed-by: Andreas Dilger Tested-by: Hudson Reviewed-by: Niu Yawei Tested-by: Maloo Reviewed-by: Johann Lombardi --- lustre/obdclass/obd_mount.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c index 4c82860..865b451 100644 --- 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); + /* 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); -- 1.8.3.1