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

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

6 files changed, 11 insertions, 11 deletions

diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c
index 8fffa7f20..373e8ce91 100644
--- a/e2fsprogs/old_e2fsprogs/e2fsck.c
+++ b/e2fsprogs/old_e2fsprogs/e2fsck.c
@@ -11577,7 +11577,7 @@ static void check_resize_inode(e2fsck_t ctx)
          * s_reserved_gdt_blocks must be zero.
          */
         if (!(fs->super->s_feature_compat &
-              EXT2_FEATURE_COMPAT_RESIZE_INODE)) {
+              EXT2_FEATURE_COMPAT_RESIZE_INO)) {
                 if (fs->super->s_reserved_gdt_blocks) {
                         pctx.num = fs->super->s_reserved_gdt_blocks;
                         if (fix_problem(ctx, PR_0_NONZERO_RESERVED_GDT_BLOCKS,
@@ -11593,7 +11593,7 @@ static void check_resize_inode(e2fsck_t ctx)
         retval = ext2fs_read_inode(fs, EXT2_RESIZE_INO, &inode);
         if (retval) {
                 if (fs->super->s_feature_compat &
-                    EXT2_FEATURE_COMPAT_RESIZE_INODE)
+                    EXT2_FEATURE_COMPAT_RESIZE_INO)
                         ctx->flags |= E2F_FLAG_RESIZE_INODE;
                 return;
         }
@@ -11603,7 +11603,7 @@ static void check_resize_inode(e2fsck_t ctx)
          * the resize inode is cleared; then we're done.
          */
         if (!(fs->super->s_feature_compat &
-              EXT2_FEATURE_COMPAT_RESIZE_INODE)) {
+              EXT2_FEATURE_COMPAT_RESIZE_INO)) {
                 for (i=0; i < EXT2_N_BLOCKS; i++) {
                         if (inode.i_block[i])
                                 break;
diff --git a/e2fsprogs/old_e2fsprogs/e2p/feature.c b/e2fsprogs/old_e2fsprogs/e2p/feature.c
index b45754f97..2102ed8e7 100644
--- a/e2fsprogs/old_e2fsprogs/e2p/feature.c
+++ b/e2fsprogs/old_e2fsprogs/e2p/feature.c
@@ -34,7 +34,7 @@ static const struct feature feature_list[] = {
                         "ext_attr" },
         {       E2P_FEATURE_COMPAT, EXT2_FEATURE_COMPAT_DIR_INDEX,
                         "dir_index" },
-        {       E2P_FEATURE_COMPAT, EXT2_FEATURE_COMPAT_RESIZE_INODE,
+        {       E2P_FEATURE_COMPAT, EXT2_FEATURE_COMPAT_RESIZE_INO,
                         "resize_inode" },
         {       E2P_FEATURE_RO_INCOMPAT, EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER,
                         "sparse_super" },
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 {
 #define EXT2_FEATURE_COMPAT_IMAGIC_INODES       0x0002
 #define EXT3_FEATURE_COMPAT_HAS_JOURNAL         0x0004
 #define EXT2_FEATURE_COMPAT_EXT_ATTR            0x0008
-#define EXT2_FEATURE_COMPAT_RESIZE_INODE        0x0010
+#define EXT2_FEATURE_COMPAT_RESIZE_INO          0x0010
 #define EXT2_FEATURE_COMPAT_DIR_INDEX           0x0020
 
 #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;
 #define EXT2_LIB_FEATURE_COMPAT_SUPP    (EXT2_FEATURE_COMPAT_DIR_PREALLOC|\
                                          EXT2_FEATURE_COMPAT_IMAGIC_INODES|\
                                          EXT3_FEATURE_COMPAT_HAS_JOURNAL|\
-                                         EXT2_FEATURE_COMPAT_RESIZE_INODE|\
+                                         EXT2_FEATURE_COMPAT_RESIZE_INO|\
                                          EXT2_FEATURE_COMPAT_DIR_INDEX|\
                                          EXT2_FEATURE_COMPAT_EXT_ATTR)
 
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:
         /*
          * check the number of reserved group descriptor table blocks
          */
-        if (super->s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE)
+        if (super->s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INO)
                 rsv_gdt = calc_reserved_gdt_blocks(fs);
         else
                 rsv_gdt = 0;
diff --git a/e2fsprogs/old_e2fsprogs/mke2fs.c b/e2fsprogs/old_e2fsprogs/mke2fs.c
index 7555650a2..35d717a55 100644
--- a/e2fsprogs/old_e2fsprogs/mke2fs.c
+++ b/e2fsprogs/old_e2fsprogs/mke2fs.c
@@ -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");
                 }