diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2012-04-17 15:06:55 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2012-04-17 15:06:55 +0200 |
commit | 176bc344751dfc41e87976182381ae0560c94f22 (patch) | |
tree | 4fceb4c364f3dbabd43724d9352969a3df36e2a5 /e2fsprogs/old_e2fsprogs/ext2fs | |
parent | 86a03bee1d3d6990c03bf500836b19ec8a1c1f12 (diff) | |
download | busybox-w32-176bc344751dfc41e87976182381ae0560c94f22.tar.gz busybox-w32-176bc344751dfc41e87976182381ae0560c94f22.tar.bz2 busybox-w32-176bc344751dfc41e87976182381ae0560c94f22.zip |
Drop include/bb_linux_ext2_fs.h, use existing e2fsprogs/e2fs_defs.h
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'e2fsprogs/old_e2fsprogs/ext2fs')
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/ext2_fs.h | 2 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/ext2fs.h | 2 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/initialize.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/ext2_fs.h b/e2fsprogs/old_e2fsprogs/ext2fs/ext2_fs.h index 6f4f70862..80ea2cbdd 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/ext2_fs.h +++ b/e2fsprogs/old_e2fsprogs/ext2fs/ext2_fs.h | |||
@@ -475,7 +475,7 @@ struct ext2_super_block { | |||
475 | #define EXT2_FEATURE_COMPAT_IMAGIC_INODES 0x0002 | 475 | #define EXT2_FEATURE_COMPAT_IMAGIC_INODES 0x0002 |
476 | #define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004 | 476 | #define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004 |
477 | #define EXT2_FEATURE_COMPAT_EXT_ATTR 0x0008 | 477 | #define EXT2_FEATURE_COMPAT_EXT_ATTR 0x0008 |
478 | #define EXT2_FEATURE_COMPAT_RESIZE_INODE 0x0010 | 478 | #define EXT2_FEATURE_COMPAT_RESIZE_INO 0x0010 |
479 | #define EXT2_FEATURE_COMPAT_DIR_INDEX 0x0020 | 479 | #define EXT2_FEATURE_COMPAT_DIR_INDEX 0x0020 |
480 | 480 | ||
481 | #define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001 | 481 | #define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001 |
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs.h b/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs.h index 9f772016f..39fb11620 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs.h +++ b/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs.h | |||
@@ -383,7 +383,7 @@ typedef struct ext2_icount *ext2_icount_t; | |||
383 | #define EXT2_LIB_FEATURE_COMPAT_SUPP (EXT2_FEATURE_COMPAT_DIR_PREALLOC|\ | 383 | #define EXT2_LIB_FEATURE_COMPAT_SUPP (EXT2_FEATURE_COMPAT_DIR_PREALLOC|\ |
384 | EXT2_FEATURE_COMPAT_IMAGIC_INODES|\ | 384 | EXT2_FEATURE_COMPAT_IMAGIC_INODES|\ |
385 | EXT3_FEATURE_COMPAT_HAS_JOURNAL|\ | 385 | EXT3_FEATURE_COMPAT_HAS_JOURNAL|\ |
386 | EXT2_FEATURE_COMPAT_RESIZE_INODE|\ | 386 | EXT2_FEATURE_COMPAT_RESIZE_INO|\ |
387 | EXT2_FEATURE_COMPAT_DIR_INDEX|\ | 387 | EXT2_FEATURE_COMPAT_DIR_INDEX|\ |
388 | EXT2_FEATURE_COMPAT_EXT_ATTR) | 388 | EXT2_FEATURE_COMPAT_EXT_ATTR) |
389 | 389 | ||
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/initialize.c b/e2fsprogs/old_e2fsprogs/ext2fs/initialize.c index ef1d34379..da2d15137 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/initialize.c +++ b/e2fsprogs/old_e2fsprogs/ext2fs/initialize.c | |||
@@ -284,7 +284,7 @@ retry: | |||
284 | /* | 284 | /* |
285 | * check the number of reserved group descriptor table blocks | 285 | * check the number of reserved group descriptor table blocks |
286 | */ | 286 | */ |
287 | if (super->s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE) | 287 | if (super->s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INO) |
288 | rsv_gdt = calc_reserved_gdt_blocks(fs); | 288 | rsv_gdt = calc_reserved_gdt_blocks(fs); |
289 | else | 289 | else |
290 | rsv_gdt = 0; | 290 | rsv_gdt = 0; |