3939 * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
4040 */
4141
42- /* Magic value used to identify an ext2 filesystem. */
43- #define EXT2_MAGIC 0xEF53
42+ /* Magic value used to identify an ext filesystem. */
43+ #define EXT_MAGIC 0xEF53
4444/* Amount of indirect blocks in an inode. */
4545#define INDIRECT_BLOCKS 12
4646/* Maximum length of a pathname. */
47- #define EXT2_PATH_MAX 4096
47+ #define EXT_PATH_MAX 4096
4848/* Maximum nesting of symlinks, used to prevent a loop. */
49- #define EXT2_MAX_SYMLINKCNT 8
49+ #define EXT_MAX_SYMLINKCNT 8
5050
5151/* The good old revision and the default inode size. */
52- #define EXT2_GOOD_OLD_REVISION 0
53- #define EXT2_DYNAMIC_REVISION 1
54- #define EXT2_GOOD_OLD_INODE_SIZE 128
52+ #define EXT_GOOD_OLD_REVISION 0
53+ #define EXT_DYNAMIC_REVISION 1
54+ #define EXT_GOOD_OLD_INODE_SIZE 128
5555
5656/* Filetype used in directory entry. */
5757#define FILETYPE_UNKNOWN 0
6565#define FILETYPE_INO_DIRECTORY 0040000
6666#define FILETYPE_INO_SYMLINK 0120000
6767
68- /* The ext2 superblock. */
69- struct ext2_sblock
68+ /* The ext superblock. */
69+ struct ext_sblock
7070{
7171 ULONG total_inodes ;
7272 ULONG total_blocks ;
@@ -106,8 +106,8 @@ struct ext2_sblock
106106 ULONG padding [77 ];
107107};
108108
109- /* The ext2 blockgroup. */
110- struct ext2_block_group
109+ /* The ext blockgroup. */
110+ struct ext_block_group
111111{
112112 ULONG block_id ;
113113 ULONG inode_id ;
@@ -119,8 +119,8 @@ struct ext2_block_group
119119 ULONG reserved [3 ];
120120};
121121
122- /* The ext2 inode. */
123- struct ext2_inode
122+ /* The ext inode. */
123+ struct ext_inode
124124{
125125 USHORT mode ;
126126 USHORT uid ;
@@ -152,89 +152,89 @@ struct ext2_inode
152152 ULONG osd2 [3 ];
153153};
154154
155- /* The header of an ext2 directory entry. */
156- #define EXT2_NAME_LEN 255
155+ /* The header of an ext directory entry. */
156+ #define EXT_NAME_LEN 255
157157
158- struct ext2_dirent
158+ struct ext_dirent
159159{
160160 ULONG inode ;
161161 USHORT direntlen ;
162162 UCHAR namelen ;
163163 UCHAR filetype ;
164- CHAR name [EXT2_NAME_LEN ];
164+ CHAR name [EXT_NAME_LEN ];
165165};
166166
167167/*
168168 * End of code from grub/fs/ext2.c
169169 */
170170
171- typedef struct ext2_sblock EXT2_SUPER_BLOCK , * PEXT2_SUPER_BLOCK ;
172- typedef struct ext2_inode EXT2_INODE , * PEXT2_INODE ;
173- typedef struct ext2_block_group EXT2_GROUP_DESC , * PEXT2_GROUP_DESC ;
174- typedef struct ext2_dirent EXT2_DIR_ENTRY , * PEXT2_DIR_ENTRY ;
171+ typedef struct ext_sblock EXT_SUPER_BLOCK , * PEXT_SUPER_BLOCK ;
172+ typedef struct ext_inode EXT_INODE , * PEXT_INODE ;
173+ typedef struct ext_block_group EXT_GROUP_DESC , * PEXT_GROUP_DESC ;
174+ typedef struct ext_dirent EXT_DIR_ENTRY , * PEXT_DIR_ENTRY ;
175175
176176/* Special inode numbers. */
177- #define EXT2_ROOT_INO 2
177+ #define EXT_ROOT_INO 2
178178
179179/* Feature set definitions. */
180180#define EXT3_FEATURE_INCOMPAT_SUPP 0x0002
181181
182- /* Log2 size of ext2 block in bytes. */
182+ /* Log2 size of ext block in bytes. */
183183#define LOG2_BLOCK_SIZE (sb ) (sb->log2_block_size + 10)
184184
185- /* The size of an ext2 block in bytes. */
186- #define EXT2_BLOCK_SIZE (sb ) (((SIZE_T)1) << LOG2_BLOCK_SIZE(sb))
185+ /* The size of an ext block in bytes. */
186+ #define EXT_BLOCK_SIZE (sb ) (((SIZE_T)1) << LOG2_BLOCK_SIZE(sb))
187187
188188/* The revision level. */
189- #define EXT2_REVISION (sb ) (sb->revision_level)
189+ #define EXT_REVISION (sb ) (sb->revision_level)
190190
191191/* The inode size. */
192- #define EXT2_INODE_SIZE (sb ) (EXT2_REVISION (sb) == EXT2_GOOD_OLD_REVISION \
193- ? EXT2_GOOD_OLD_INODE_SIZE \
192+ #define EXT_INODE_SIZE (sb ) (EXT_REVISION (sb) == EXT_GOOD_OLD_REVISION \
193+ ? EXT_GOOD_OLD_INODE_SIZE \
194194 : sb->inode_size)
195195
196- #define EXT2_DESC_PER_BLOCK (s ) (EXT2_BLOCK_SIZE (s) / sizeof(struct ext2_block_group ))
197-
198- // EXT2_INODE ::mode values
199- #define EXT2_S_IRWXO 0x0007 // Other mask
200- #define EXT2_S_IXOTH 0x0001 // ---------x execute
201- #define EXT2_S_IWOTH 0x0002 // --------w- write
202- #define EXT2_S_IROTH 0x0004 // -------r-- read
203-
204- #define EXT2_S_IRWXG 0x0038 // Group mask
205- #define EXT2_S_IXGRP 0x0008 // ------x--- execute
206- #define EXT2_S_IWGRP 0x0010 // -----w---- write
207- #define EXT2_S_IRGRP 0x0020 // ----r----- read
208-
209- #define EXT2_S_IRWXU 0x01C0 // User mask
210- #define EXT2_S_IXUSR 0x0040 // ---x------ execute
211- #define EXT2_S_IWUSR 0x0080 // --w------- write
212- #define EXT2_S_IRUSR 0x0100 // -r-------- read
213-
214- #define EXT2_S_ISVTX 0x0200 // Sticky bit
215- #define EXT2_S_ISGID 0x0400 // SGID
216- #define EXT2_S_ISUID 0x0800 // SUID
217-
218- #define EXT2_S_IFMT 0xF000 // Format mask
219- #define EXT2_S_IFIFO 0x1000 // FIFO buffer
220- #define EXT2_S_IFCHR 0x2000 // Character device
221- #define EXT2_S_IFDIR 0x4000 // Directory
222- #define EXT2_S_IFBLK 0x6000 // Block device
223- #define EXT2_S_IFREG 0x8000 // Regular file
224- #define EXT2_S_IFLNK 0xA000 // Symbolic link
225- #define EXT2_S_IFSOCK 0xC000 // Socket
196+ #define EXT_DESC_PER_BLOCK (s ) (EXT_BLOCK_SIZE (s) / sizeof(struct ext_block_group ))
197+
198+ // EXT_INODE ::mode values
199+ #define EXT_S_IRWXO 0x0007 // Other mask
200+ #define EXT_S_IXOTH 0x0001 // ---------x execute
201+ #define EXT_S_IWOTH 0x0002 // --------w- write
202+ #define EXT_S_IROTH 0x0004 // -------r-- read
203+
204+ #define EXT_S_IRWXG 0x0038 // Group mask
205+ #define EXT_S_IXGRP 0x0008 // ------x--- execute
206+ #define EXT_S_IWGRP 0x0010 // -----w---- write
207+ #define EXT_S_IRGRP 0x0020 // ----r----- read
208+
209+ #define EXT_S_IRWXU 0x01C0 // User mask
210+ #define EXT_S_IXUSR 0x0040 // ---x------ execute
211+ #define EXT_S_IWUSR 0x0080 // --w------- write
212+ #define EXT_S_IRUSR 0x0100 // -r-------- read
213+
214+ #define EXT_S_ISVTX 0x0200 // Sticky bit
215+ #define EXT_S_ISGID 0x0400 // SGID
216+ #define EXT_S_ISUID 0x0800 // SUID
217+
218+ #define EXT_S_IFMT 0xF000 // Format mask
219+ #define EXT_S_IFIFO 0x1000 // FIFO buffer
220+ #define EXT_S_IFCHR 0x2000 // Character device
221+ #define EXT_S_IFDIR 0x4000 // Directory
222+ #define EXT_S_IFBLK 0x6000 // Block device
223+ #define EXT_S_IFREG 0x8000 // Regular file
224+ #define EXT_S_IFLNK 0xA000 // Symbolic link
225+ #define EXT_S_IFSOCK 0xC000 // Socket
226226
227227#define FAST_SYMLINK_MAX_NAME_SIZE 60
228228
229- typedef struct _EXT2_VOLUME_INFO * PEXT2_VOLUME_INFO ;
229+ typedef struct _EXT_VOLUME_INFO * PEXT_VOLUME_INFO ;
230230
231231typedef struct
232232{
233233 ULONGLONG FileSize ; // File size
234234 ULONGLONG FilePointer ; // File pointer
235235 ULONG * FileBlockList ; // File block list
236- EXT2_INODE Inode ; // File's inode
237- PEXT2_VOLUME_INFO Volume ;
238- } EXT2_FILE_INFO , * PEXT2_FILE_INFO ;
236+ EXT_INODE Inode ; // File's inode
237+ PEXT_VOLUME_INFO Volume ;
238+ } EXT_FILE_INFO , * PEXT_FILE_INFO ;
239239
240- const DEVVTBL * Ext2Mount (ULONG DeviceId );
240+ const DEVVTBL * ExtMount (ULONG DeviceId );
0 commit comments