From: scjody <scjody>
Date: Thu, 16 Aug 2007 01:19:57 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: v1_8_0_110~1334
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=0551eb9ee659126d44a307a03b815a202c893cc7;p=fs%2Flustre-release.git

Branch b1_6

Revert incorrect commit.
---

diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index 9916196..b846448 100644
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -546,9 +546,13 @@ int make_lustre_backfs(struct mkfs_opts *mop)
 
                 if (strstr(mop->mo_mkfsopts, "-O") == NULL) {
                         /* Enable hashed b-tree directory lookup in large dirs
-                           bz6224, and don't initialize all groups. */
-                        strscat(mop->mo_mkfsopts, " -O dir_index,uninit_groups",
+                           bz6224 */
+                        strscat(mop->mo_mkfsopts, " -O dir_index",
                                 sizeof(mop->mo_mkfsopts));
+                        /* ldiskfs2: do not initialize all groups. */
+                        if (mop->mo_ldd.ldd_mount_type == LDD_MT_LDISKFS2)
+                                strscat(mop->mo_mkfsopts, ",uninit_groups",
+                                        sizeof(mop->mo_mkfsopts));
                 }
 
                 /* Allow reformat of full devices (as opposed to