From 3c670d0a3e156a4b051b07a4d6ef7b001f8dcf69 Mon Sep 17 00:00:00 2001 From: kalpak Date: Sun, 29 Jun 2008 10:08:39 +0000 Subject: [PATCH] b=13103 (patch by adilger) i=kalpak,girish upstream e2fsprogs calls uninit_groups feature as uninit_bg. So mkfs.lustre should check for uninit_bg feature also --- lustre/utils/mkfs_lustre.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c index f90f2df..8f85235 100644 --- a/lustre/utils/mkfs_lustre.c +++ b/lustre/utils/mkfs_lustre.c @@ -535,11 +535,16 @@ static void enable_default_backfs_features(struct mkfs_opts *mop) strscat(mop->mo_mkfsopts, " -O dir_index", sizeof(mop->mo_mkfsopts)); + /* Upstream e2fsprogs called our uninit_groups feature uninit_bg, + * check for both of them when testing e2fsprogs features. */ if (is_e2fsprogs_feature_supp("uninit_groups") == 0) strscat(mop->mo_mkfsopts, ",uninit_groups", sizeof(mop->mo_mkfsopts)); + else if (is_e2fsprogs_feature_supp("uninit_bg") == 0) + strscat(mop->mo_mkfsopts, ",uninit_bg", + sizeof(mop->mo_mkfsopts)); else - disp_old_e2fsprogs_msg("uninit_groups", 1); + disp_old_e2fsprogs_msg("uninit_bg", 1); ret = uname(&uts); if (ret) -- 1.8.3.1