X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Flibmount_utils_ldiskfs.c;h=5907213061e83915c9cd144ced5c5622dbfdd553;hb=14b8276e06d6f4e3bfe785df1165458555e406f3;hp=7532d11be6b28792adbf5947d84111009dde01e4;hpb=7dc8aa7e7848f800c54eb18ecd59d665484ce822;p=fs%2Flustre-release.git

diff --git a/lustre/utils/libmount_utils_ldiskfs.c b/lustre/utils/libmount_utils_ldiskfs.c
index 7532d11..5907213 100644
--- a/lustre/utils/libmount_utils_ldiskfs.c
+++ b/lustre/utils/libmount_utils_ldiskfs.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lustre/utils/mount_utils_ldiskfs.c
  *
@@ -510,6 +509,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 +884,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", maxbuflen);
+		ext_opts = 1;
+	}
+	if (is_e2fsprogs_feature_supp("-E lazy_itable_init=0")) {
+		append_unique(start, ext_opts ? "," : "-E",
+			    "lazy_itable_init", "0", maxbuflen);
+		ext_opts = 1;
+	}
+
 	/* end handle -E mkfs options */
 
 	/* Allow reformat of full devices (as opposed to partitions).