LU-5062 llite: Solve a race to access lli_has_smd in read case

[fs/lustre-release.git] / lustre / obdclass / obd_mount_server.c

diff --git a/lustre/obdclass/obd_mount_server.c b/lustre/obdclass/obd_mount_server.c
index 02d2cb0..0cefea2 100644 (file)
--- a/lustre/obdclass/obd_mount_server.c
+++ b/lustre/obdclass/obd_mount_server.c
@@ -698,16 +698,18 @@ static int lustre_lwp_add_conn(struct lustre_cfg *cfg,
                                   lustre_cfg_string(cfg, 1));
 
        lcfg = lustre_cfg_new(LCFG_ADD_CONN, bufs);
-
+       if (lcfg == NULL)
+               GOTO(out_cfg, rc = -ENOMEM);
        rc = class_add_conn(lwp, lcfg);
        if (rc)
                CERROR("%s: can't add conn: rc = %d\n", lwpname, rc);
 
-out:
-       if (bufs != NULL)
-               OBD_FREE_PTR(bufs);
        if (lcfg != NULL)
                lustre_cfg_free(lcfg);
+out_cfg:
+       if (bufs != NULL)
+               OBD_FREE_PTR(bufs);
+out:
        if (lwpname != NULL)
                OBD_FREE(lwpname, MTI_NAME_MAXLEN);
        RETURN(rc);
@@ -826,8 +828,11 @@ static int client_lwp_config_process(const struct lu_env *env,
                        *ptr = '-';
                        break;
                }
-
                *ptr = '-';
+
+               if (IS_MDT(lsi) && idx != 0)
+                       break;
+
                rc = lustre_lwp_add_conn(lcfg, lsi, idx);
                break;
        }