tune2fs, mke2fs: Change default directory hash algorithm to half_md4

The half_md4 algorithm is faster and more collision resistant.  Let's
switch to it as the default.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index c1850a4d11b16bd295692053667cb58585001e14..70ff889361f8306373202dacc8effee75725666d 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -1880,7 +1880,7 @@ int main (int argc, char *argv[])
        /*
         * Initialize the directory index variables
         */
-       fs->super->s_def_hash_version = EXT2_HASH_TEA;
+       fs->super->s_def_hash_version = EXT2_HASH_HALF_MD4;
        uuid_generate((unsigned char *) fs->super->s_hash_seed);
 
        /*

diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index a1fa57b7330d236a678b7082ec68df4a340c85eb..ab35a71f46685ca87d48d327206b93ffd49326f6 100644 (file)
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -399,7 +399,7 @@ static void update_feature_set(ext2_filsys fs, char *features)
 
        if (FEATURE_ON(E2P_FEATURE_COMPAT, EXT2_FEATURE_COMPAT_DIR_INDEX)) {
                if (!sb->s_def_hash_version)
-                       sb->s_def_hash_version = EXT2_HASH_TEA;
+                       sb->s_def_hash_version = EXT2_HASH_HALF_MD4;
                if (uuid_is_null((unsigned char *) sb->s_hash_seed))
                        uuid_generate((unsigned char *) sb->s_hash_seed);
        }

diff --git a/tests/m_dasd_bs/expect.1 b/tests/m_dasd_bs/expect.1
index 59fc457b652c4c474b76ce05b63ad66a3700ff4f..9bc8a856e5647ec6341a7709589b8bce3dcf3319 100644 (file)
--- a/tests/m_dasd_bs/expect.1
+++ b/tests/m_dasd_bs/expect.1
@@ -53,7 +53,7 @@ Reserved blocks uid:      0
 Reserved blocks gid:      0
 First inode:              11
 Inode size:              128
-Default directory hash:   tea
+Default directory hash:   half_md4
 
 
 Group 0: (Blocks 0-16383)

diff --git a/tests/m_large_file/expect.1 b/tests/m_large_file/expect.1
index ae27f02192a2096ba39e57cda1e5ed324d9c7d32..abf2d997c087821d00aaec5bbf101d6ac9cb9494 100644 (file)
--- a/tests/m_large_file/expect.1
+++ b/tests/m_large_file/expect.1
@@ -53,7 +53,7 @@ First inode:              11
 Inode size:              256
 Required extra isize:     28
 Desired extra isize:      28
-Default directory hash:   tea
+Default directory hash:   half_md4
 
 
 Group 0: (Blocks 0-16383)

diff --git a/tests/m_meta_bg/expect.1 b/tests/m_meta_bg/expect.1
index 7401fd9f8eaa5aa02a64f1389e445f389eb37583..d44be8cf0dc8d1a528a06e7d6aa35e73602624c3 100644 (file)
--- a/tests/m_meta_bg/expect.1
+++ b/tests/m_meta_bg/expect.1
@@ -51,7 +51,7 @@ Reserved blocks uid:      0
 Reserved blocks gid:      0
 First inode:              11
 Inode size:              128
-Default directory hash:   tea
+Default directory hash:   half_md4
 
 
 Group 0: (Blocks 1-1024)

diff --git a/tests/m_no_opt/expect.1 b/tests/m_no_opt/expect.1
index a63358b7be6844a3b2dde4bc05a75e3731fdea9b..faa565d85a030218a43299d2245963b3732d64e8 100644 (file)
--- a/tests/m_no_opt/expect.1
+++ b/tests/m_no_opt/expect.1
@@ -51,7 +51,7 @@ Reserved blocks uid:      0
 Reserved blocks gid:      0
 First inode:              11
 Inode size:              128
-Default directory hash:   tea
+Default directory hash:   half_md4
 
 
 Group 0: (Blocks 1-8192)

diff --git a/tests/m_raid_opt/expect.1 b/tests/m_raid_opt/expect.1
index f3c14b64350f73ee95862e4707a3c720de3fe396..181534d834984275dbb6cd21645b8b80bb714b97 100644 (file)
--- a/tests/m_raid_opt/expect.1
+++ b/tests/m_raid_opt/expect.1
@@ -54,7 +54,7 @@ Reserved blocks uid:      0
 Reserved blocks gid:      0
 First inode:              11
 Inode size:              128
-Default directory hash:   tea
+Default directory hash:   half_md4
 
 
 Group 0: (Blocks 1-1024)

diff --git a/tests/m_std/expect.1 b/tests/m_std/expect.1
index 9f5e66e6462c618e0d028761fba8591b4d86eea7..448357852dfe7d67f062a8af26329b3d34e90c13 100644 (file)
--- a/tests/m_std/expect.1
+++ b/tests/m_std/expect.1
@@ -53,7 +53,7 @@ Reserved blocks uid:      0
 Reserved blocks gid:      0
 First inode:              11
 Inode size:              128
-Default directory hash:   tea
+Default directory hash:   half_md4
 
 
 Group 0: (Blocks 1-8192)

diff --git a/tests/m_uninit/expect.1 b/tests/m_uninit/expect.1
index 02649d88a32bb072f056d134265df8fd2e23e2cf..549acedd3432471229d6d5e5fb4dd5b1db175274 100644 (file)
--- a/tests/m_uninit/expect.1
+++ b/tests/m_uninit/expect.1
@@ -53,7 +53,7 @@ Reserved blocks uid:      0
 Reserved blocks gid:      0
 First inode:              11
 Inode size:              128
-Default directory hash:   tea
+Default directory hash:   half_md4
 
 
 Group 0: (Blocks 1-8192) [ITABLE_ZEROED]

diff --git a/tests/r_move_itable/expect b/tests/r_move_itable/expect
index 63fda32962c3e1492d9dc750de7df2d8192f6156..0d08b1695fe46a466064816c6a527f6f1f5a5063 100644 (file)
--- a/tests/r_move_itable/expect
+++ b/tests/r_move_itable/expect
@@ -42,7 +42,7 @@ Reserved blocks uid:      0
 Reserved blocks gid:      0
 First inode:              11
 Inode size:              128
-Default directory hash:   tea
+Default directory hash:   half_md4
 
 
 Group 0: (Blocks 1-256)
@@ -343,7 +343,7 @@ Reserved blocks uid:      0
 Reserved blocks gid:      0
 First inode:              11
 Inode size:              128
-Default directory hash:   tea
+Default directory hash:   half_md4
 
 
 Group 0: (Blocks 1-256)
@@ -880,7 +880,7 @@ Reserved blocks uid:      0
 Reserved blocks gid:      0
 First inode:              11
 Inode size:              128
-Default directory hash:   tea
+Default directory hash:   half_md4
 
 
 Group 0: (Blocks 1-256)
@@ -1653,7 +1653,7 @@ Reserved blocks uid:      0
 Reserved blocks gid:      0
 First inode:              11
 Inode size:              128
-Default directory hash:   tea
+Default directory hash:   half_md4
 
 
 Group 0: (Blocks 1-256)

diff --git a/tests/r_resize_inode/expect b/tests/r_resize_inode/expect
index 09ebeb09c2de5c398d7eebf6625771bc33791dce..f4bee0fb51d1f5e2f498e523b7f282e44ee0776e 100644 (file)
--- a/tests/r_resize_inode/expect
+++ b/tests/r_resize_inode/expect
@@ -40,7 +40,7 @@ Reserved blocks uid:      0
 Reserved blocks gid:      0
 First inode:              11
 Inode size:              128
-Default directory hash:   tea
+Default directory hash:   half_md4
 
 
 Group 0: (Blocks 1-1024)
@@ -488,7 +488,7 @@ Reserved blocks uid:      0
 Reserved blocks gid:      0
 First inode:              11
 Inode size:              128
-Default directory hash:   tea
+Default directory hash:   half_md4
 
 
 Group 0: (Blocks 1-1024)
@@ -645,7 +645,7 @@ Reserved blocks uid:      0
 Reserved blocks gid:      0
 First inode:              11
 Inode size:              128
-Default directory hash:   tea
+Default directory hash:   half_md4
 
 
 Group 0: (Blocks 1-1024)