diff options
Diffstat (limited to 'include/linux/ext3_fs.h')
-rw-r--r-- | include/linux/ext3_fs.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h index ece49a804fe1..589b0b355d84 100644 --- a/include/linux/ext3_fs.h +++ b/include/linux/ext3_fs.h | |||
@@ -35,10 +35,6 @@ | |||
35 | /*max window size: 1024(direct blocks) + 3([t,d]indirect blocks) */ | 35 | /*max window size: 1024(direct blocks) + 3([t,d]indirect blocks) */ |
36 | #define EXT3_MAX_RESERVE_BLOCKS 1027 | 36 | #define EXT3_MAX_RESERVE_BLOCKS 1027 |
37 | #define EXT3_RESERVE_WINDOW_NOT_ALLOCATED 0 | 37 | #define EXT3_RESERVE_WINDOW_NOT_ALLOCATED 0 |
38 | /* | ||
39 | * Always enable hashed directories | ||
40 | */ | ||
41 | #define CONFIG_EXT3_INDEX | ||
42 | 38 | ||
43 | /* | 39 | /* |
44 | * Debug code | 40 | * Debug code |
@@ -665,17 +661,11 @@ struct ext3_dir_entry_2 { | |||
665 | * (c) Daniel Phillips, 2001 | 661 | * (c) Daniel Phillips, 2001 |
666 | */ | 662 | */ |
667 | 663 | ||
668 | #ifdef CONFIG_EXT3_INDEX | 664 | #define is_dx(dir) (EXT3_HAS_COMPAT_FEATURE(dir->i_sb, \ |
669 | #define is_dx(dir) (EXT3_HAS_COMPAT_FEATURE(dir->i_sb, \ | 665 | EXT3_FEATURE_COMPAT_DIR_INDEX) && \ |
670 | EXT3_FEATURE_COMPAT_DIR_INDEX) && \ | ||
671 | (EXT3_I(dir)->i_flags & EXT3_INDEX_FL)) | 666 | (EXT3_I(dir)->i_flags & EXT3_INDEX_FL)) |
672 | #define EXT3_DIR_LINK_MAX(dir) (!is_dx(dir) && (dir)->i_nlink >= EXT3_LINK_MAX) | 667 | #define EXT3_DIR_LINK_MAX(dir) (!is_dx(dir) && (dir)->i_nlink >= EXT3_LINK_MAX) |
673 | #define EXT3_DIR_LINK_EMPTY(dir) ((dir)->i_nlink == 2 || (dir)->i_nlink == 1) | 668 | #define EXT3_DIR_LINK_EMPTY(dir) ((dir)->i_nlink == 2 || (dir)->i_nlink == 1) |
674 | #else | ||
675 | #define is_dx(dir) 0 | ||
676 | #define EXT3_DIR_LINK_MAX(dir) ((dir)->i_nlink >= EXT3_LINK_MAX) | ||
677 | #define EXT3_DIR_LINK_EMPTY(dir) ((dir)->i_nlink == 2) | ||
678 | #endif | ||
679 | 669 | ||
680 | /* Legal values for the dx_root hash_version field: */ | 670 | /* Legal values for the dx_root hash_version field: */ |
681 | 671 | ||