From 97228e24078f8e5ed62b4e39e9b0653a4d128599 Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 1 Feb 2006 18:03:26 +0000 Subject: [PATCH] Branch b_release_1_4_6 b=10130 r=adilger Set a fake non-0 NAL in 1.4.6, so if someone runs a pre-LNET version without --write-conf, the ASSERT in class_add_uuid doesn't crash us. --- lustre/utils/llog_reader.c | 2 ++ lustre/utils/lustre_cfg.c | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lustre/utils/llog_reader.c b/lustre/utils/llog_reader.c index bbb827f..73f10aa 100644 --- a/lustre/utils/llog_reader.c +++ b/lustre/utils/llog_reader.c @@ -216,6 +216,8 @@ static void print_1_cfg(struct lustre_cfg *lcfg) if (lcfg->lcfg_nid) printf("nid=%s("LPX64") ", libcfs_nid2str(lcfg->lcfg_nid), lcfg->lcfg_nid); + if (lcfg->lcfg_nal) + printf("nal=%d ", lcfg->lcfg_nal); for (i = 0; i < lcfg->lcfg_bufcount; i++) printf("%d:%.*s ", i, lcfg->lcfg_buflens[i], (char*)lustre_cfg_buf(lcfg, i)); diff --git a/lustre/utils/lustre_cfg.c b/lustre/utils/lustre_cfg.c index eea50e4..2ce70e4 100644 --- a/lustre/utils/lustre_cfg.c +++ b/lustre/utils/lustre_cfg.c @@ -265,6 +265,9 @@ int do_add_uuid(char * func, char *uuid, lnet_nid_t nid) lcfg = lustre_cfg_new(LCFG_ADD_UUID, &bufs); lcfg->lcfg_nid = nid; + /* Poison NAL -- pre 1.4.6 will LASSERT on 0 NAL, this way it + doesn't work without crashing (bz 10130) */ + lcfg->lcfg_nal = 0x5a; #if 0 fprintf(stderr, "adding\tnid: %d\tuuid: %s\n", @@ -601,7 +604,7 @@ int jt_lcfg_add_conn(int argc, char **argv) fprintf(stderr, "%s: please use 'cfg_device name' to set the " "device name for config commands.\n", jt_cmdname(argv[0])); - return -EINVAL; + return -EINVAL; } lustre_cfg_bufs_reset(&bufs, lcfg_devname); @@ -634,7 +637,7 @@ int jt_lcfg_del_conn(int argc, char **argv) fprintf(stderr, "%s: please use 'cfg_device name' to set the " "device name for config commands.\n", jt_cmdname(argv[0])); - return -EINVAL; + return -EINVAL; } lustre_cfg_bufs_reset(&bufs, lcfg_devname); -- 1.8.3.1