From ebea7c87f758d843cf71fb5873b2955f6fbf9044 Mon Sep 17 00:00:00 2001 From: Sebastien Buisson Date: Thu, 14 Feb 2019 00:41:47 +0900 Subject: [PATCH] LU-11961 nodemap: nodemap_create() handles default nodemap nodemap_create() is responsible for assigning nmc_default_nodemap so it should not be done outside of this function. Signed-off-by: Sebastien Buisson Change-Id: I8d0615196e32fb8e6c59ddedd421323a7d6eff7f Reviewed-on: https://review.whamcloud.com/34245 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Jeremy Filizetti Reviewed-by: Oleg Drokin --- lustre/ptlrpc/nodemap_storage.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lustre/ptlrpc/nodemap_storage.c b/lustre/ptlrpc/nodemap_storage.c index 6951db0..0a7602e 100644 --- a/lustre/ptlrpc/nodemap_storage.c +++ b/lustre/ptlrpc/nodemap_storage.c @@ -722,7 +722,6 @@ static int nodemap_process_keyrec(struct nodemap_config *config, if (nodemap_id == LUSTRE_NODEMAP_DEFAULT_ID) { nodemap = nodemap_create(rec->ncr.ncr_name, config, 1); - config->nmc_default_nodemap = nodemap; } else { nodemap = nodemap_create(rec->ncr.ncr_name, config, 0); @@ -937,10 +936,10 @@ out: if (new_config->nmc_default_nodemap == NULL) { /* new MGS won't have a default nm on disk, so create it here */ - new_config->nmc_default_nodemap = + struct lu_nodemap *nodemap = nodemap_create(DEFAULT_NODEMAP, new_config, 1); - if (IS_ERR(new_config->nmc_default_nodemap)) { - rc = PTR_ERR(new_config->nmc_default_nodemap); + if (IS_ERR(nodemap)) { + rc = PTR_ERR(nodemap); } else { rc = nodemap_idx_nodemap_add_update( new_config->nmc_default_nodemap, -- 1.8.3.1