emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop include/bb_linux_ext2_fs.h, use existing e2fsprogs/e2fs_defs.h

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2012-04-17 15:06:55 +02:00
parent 86a03bee1d
commit 176bc34475
11 changed files with 15 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e2fsprogs/old_e2fsprogs/mke2fs.c
View File

@@ -757,7 +757,7 @@ static void parse_extended_opts(struct ext2_super_block *sb_param,
if (rsv_gdb > 0) {
sb_param->s_feature_compat |=
EXT2_FEATURE_COMPAT_RESIZE_INODE;
EXT2_FEATURE_COMPAT_RESIZE_INO;
sb_param->s_reserved_gdt_blocks = rsv_gdb;
}
@@ -778,7 +778,7 @@ static void parse_extended_opts(struct ext2_super_block *sb_param,
static __u32 ok_features[3] = {
EXT3_FEATURE_COMPAT_HAS_JOURNAL |
EXT2_FEATURE_COMPAT_RESIZE_INODE |
EXT2_FEATURE_COMPAT_RESIZE_INO |
EXT2_FEATURE_COMPAT_DIR_INDEX, /* Compat */
EXT2_FEATURE_INCOMPAT_FILETYPE| /* Incompat */
EXT3_FEATURE_INCOMPAT_JOURNAL_DEV|
@@ -1123,7 +1123,7 @@ static int PRS(int argc, char **argv)
/* Since sparse_super is the default, we would only have a problem
* here if it was explicitly disabled.
*/
if ((param.s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE) &&
if ((param.s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INO) &&
!(param.s_feature_ro_compat&EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER)) {
bb_error_msg_and_die("reserved online resize blocks not supported "
"on non-sparse filesystem");
@@ -1312,7 +1312,7 @@ int mke2fs_main (int argc, char **argv)
reserve_inodes(fs);
create_bad_block_inode(fs, bb_list);
if (fs->super->s_feature_compat &
EXT2_FEATURE_COMPAT_RESIZE_INODE) {
EXT2_FEATURE_COMPAT_RESIZE_INO) {
retval = ext2fs_create_resize_inode(fs);
mke2fs_error_msg_and_die(retval, "reserve blocks for online resize");
}