From 9db2fa9133b15a99a1d5a04914964a015de32367 Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Wed, 19 Feb 2020 16:56:28 -0600 Subject: [PATCH] LU-13252 mgs: Handle possible failure from name_create_mdt name_create_mdt may not succeed if memory allocation fails. Cray-bug-id: LUS-8503 Signed-off-by: Shaun Tancheff Change-Id: I692cfd962e39b7f41d21bcfff1d7577a722ab80d Reviewed-on: https://review.whamcloud.com/37584 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Andreas Dilger Reviewed-by: Petros Koutoupis --- lustre/mgs/mgs_llog.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lustre/mgs/mgs_llog.c b/lustre/mgs/mgs_llog.c index 08c2a37..726262f 100644 --- a/lustre/mgs/mgs_llog.c +++ b/lustre/mgs/mgs_llog.c @@ -1594,7 +1594,9 @@ int mgs_replace_nids(const struct lu_env *env, } /* Process client llogs */ - name_create(&logname, fsname, "-client"); + rc = name_create(&logname, fsname, "-client"); + if (rc) + GOTO(out, rc); rc = mgs_replace_nids_log(env, mgs_obd, logname, devname, nids); name_destroy(&logname); if (rc) { @@ -1607,7 +1609,9 @@ int mgs_replace_nids(const struct lu_env *env, for (i = 0; i < INDEX_MAP_SIZE * 8; i++) { if (!test_bit(i, fsdb->fsdb_mdt_index_map)) continue; - name_create_mdt(&logname, fsname, i); + rc = name_create_mdt(&logname, fsname, i); + if (rc) + GOTO(out, rc); rc = mgs_replace_nids_log(env, mgs_obd, logname, devname, nids); name_destroy(&logname); if (rc) -- 1.8.3.1