Whamcloud - gitweb
LU-14767 utils: mkfs.lustre allow lazy_itable_init=1 19/44019/3
authorAndreas Dilger <adilger@whamcloud.com>
Wed, 16 Jun 2021 20:48:33 +0000 (14:48 -0600)
committerOleg Drokin <green@whamcloud.com>
Thu, 8 Jul 2021 02:06:48 +0000 (02:06 +0000)
When "lazy_itable_init=0" was added to the mke2fs options the call
to append_unique() to see whether "lazy_itable_init" was already
listed in the mke2fs options was incorrect. It checks to see if
"lazy_itable_init=0" is already present in the options, and doesn't
match "lazy_itable_init=1" if it was specified on the command-line.

Separate the key and value passed to append_unique() so that it can
check if any form of the key is present in the existing options.

Test-Parameters: trivial testlist=conf-sanity
Fixes: 701cc249594e ("LU-13533 utils: ext4lazyinit should be disabled")
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Ic7a6dbb81f004dd35f0f1c5f5ddec0fb363ebbe5
Reviewed-on: https://review.whamcloud.com/44019
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Artem Blagodarenko <artem.blagodarenko@hpe.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre/utils/libmount_utils_ldiskfs.c

index c7a6aae..5907213 100644 (file)
@@ -886,12 +886,12 @@ int ldiskfs_make_lustre(struct mkfs_opts *mop)
        /* Avoid zeroing out the full journal - speeds up mkfs */
        if (is_e2fsprogs_feature_supp("-E lazy_journal_init=0")) {
                append_unique(start, ext_opts ? "," : " -E ",
-                             "lazy_journal_init=0", NULL, maxbuflen);
+                             "lazy_journal_init", "0", maxbuflen);
                ext_opts = 1;
        }
        if (is_e2fsprogs_feature_supp("-E lazy_itable_init=0")) {
                append_unique(start, ext_opts ? "," : "-E",
-                           "lazy_itable_init=0", NULL, maxbuflen);
+                           "lazy_itable_init", "0", maxbuflen);
                ext_opts = 1;
        }