LU-14388 utils: always enable ldiskfs project quota

[fs/lustre-release.git] / lustre / utils / libmount_utils_ldiskfs.c

diff --git a/lustre/utils/libmount_utils_ldiskfs.c b/lustre/utils/libmount_utils_ldiskfs.c
index 7532d11..3fe870c 100644 (file)
--- a/lustre/utils/libmount_utils_ldiskfs.c
+++ b/lustre/utils/libmount_utils_ldiskfs.c
@@ -510,6 +510,9 @@ static int enable_default_ext4_features(struct mkfs_opts *mop, char *anchor,
        /* Enable quota by default */
        if (is_e2fsprogs_feature_supp("-O quota")) {
                append_unique(anchor, ",", "quota", NULL, maxbuflen);
+               /* Enable project quota by default */
+               if (is_e2fsprogs_feature_supp("-O project"))
+                       append_unique(anchor, ",", "project", NULL, maxbuflen);
        } else {
                fatal();
                fprintf(stderr, "\"-O quota\" must be supported by "
@@ -882,9 +885,17 @@ 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"))
+       if (is_e2fsprogs_feature_supp("-E lazy_journal_init=0")) {
                append_unique(start, ext_opts ? "," : " -E ",
-                             "lazy_journal_init", NULL, maxbuflen);
+                             "lazy_journal_init=0", NULL, 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);
+               ext_opts = 1;
+       }
+
        /* end handle -E mkfs options */
 
        /* Allow reformat of full devices (as opposed to partitions).