summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Brateau <etienne.brateau@gmail.com>2022-01-23 05:16:59 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2022-01-23 10:49:23 +0100
commitdea4f12a7cf28cf776b522bc46f901a9b2a7401e (patch)
tree5e6c832c1025d5936f4e3e63ccceedcbec3ed062
parentf3cbdcbb9d571d7b145c659e26656ffb6617b0db (diff)
ext2fs Merge 2 headers
* ext2_fs_i.h: merge it into ext2_fs.h. This is also done in the linux tree Message-Id: <20220123041715.19402-1-etienne.brateau@gmail.com>
-rw-r--r--ext2fs/ext2_fs.h22
-rw-r--r--ext2fs/ext2_fs_i.h41
-rw-r--r--ext2fs/ext2fs.h1
3 files changed, 22 insertions, 42 deletions
diff --git a/ext2fs/ext2_fs.h b/ext2fs/ext2_fs.h
index 019ba154..90b1418d 100644
--- a/ext2fs/ext2_fs.h
+++ b/ext2fs/ext2_fs.h
@@ -534,6 +534,28 @@ struct ext2_dir_entry_2 {
#define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \
~EXT2_DIR_ROUND)
+/*
+ * second extended file system inode data in memory
+ */
+struct ext2_inode_info {
+ __u32 i_data[15];
+ __u32 i_flags;
+ __u32 i_faddr;
+ __u8 i_frag_no;
+ __u8 i_frag_size;
+ __u16 i_osync;
+ __u32 i_file_acl;
+ __u32 i_dir_acl;
+ __u32 i_dtime;
+ __u32 not_used_1; /* FIX: not used/ 2.2 placeholder */
+ __u32 i_block_group;
+ __u32 i_next_alloc_block;
+ __u32 i_next_alloc_goal;
+ __u32 i_prealloc_block;
+ __u32 i_prealloc_count;
+ int i_new_inode:1; /* Is a freshly allocated inode */
+};
+
#ifdef __KERNEL__
/*
* Function prototypes
diff --git a/ext2fs/ext2_fs_i.h b/ext2fs/ext2_fs_i.h
deleted file mode 100644
index eefdbfaf..00000000
--- a/ext2fs/ext2_fs_i.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * linux/include/linux/ext2_fs_i.h
- *
- * Copyright (C) 1992, 1993, 1994, 1995
- * Remy Card (card@masi.ibp.fr)
- * Laboratoire MASI - Institut Blaise Pascal
- * Universite Pierre et Marie Curie (Paris VI)
- *
- * from
- *
- * linux/include/linux/minix_fs_i.h
- *
- * Copyright (C) 1991, 1992 Linus Torvalds
- */
-
-#ifndef _LINUX_EXT2_FS_I
-#define _LINUX_EXT2_FS_I
-
-/*
- * second extended file system inode data in memory
- */
-struct ext2_inode_info {
- __u32 i_data[15];
- __u32 i_flags;
- __u32 i_faddr;
- __u8 i_frag_no;
- __u8 i_frag_size;
- __u16 i_osync;
- __u32 i_file_acl;
- __u32 i_dir_acl;
- __u32 i_dtime;
- __u32 not_used_1; /* FIX: not used/ 2.2 placeholder */
- __u32 i_block_group;
- __u32 i_next_alloc_block;
- __u32 i_next_alloc_goal;
- __u32 i_prealloc_block;
- __u32 i_prealloc_count;
- int i_new_inode:1; /* Is a freshly allocated inode */
-};
-
-#endif /* _LINUX_EXT2_FS_I */
diff --git a/ext2fs/ext2fs.h b/ext2fs/ext2fs.h
index ba0eaecd..bc60af7b 100644
--- a/ext2fs/ext2fs.h
+++ b/ext2fs/ext2fs.h
@@ -44,7 +44,6 @@ typedef u_int8_t __u8;
typedef int8_t __s8;
#include "ext2_fs.h"
-#include "ext2_fs_i.h"
#define i_mode_high osd2.hurd2.h_i_mode_high /* missing from ext2_fs.h */