Changeset 76216 in vbox for trunk/include

Timestamp:

Dec 13, 2018 7:26:25 PM (6 years ago)

Author:

vboxsync

Message:

Runtime/fs: Started restructurin the ext2 filesystem code to indicate that it will be used for ext3/ext4 later on

Location:

trunk/include/iprt

Files:

• formats/ext.h (moved) (moved from trunk/include/iprt/formats/ext2.h ) (5 diffs)
• mangling.h (modified) (1 diff)

trunk/include/iprt/formats/ext.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT Filesystem API (FileSys) - ext2/3 format.
+ * IPRT, Ext2/3/4 format.
  */
 
 /*
- * Copyright (C) 2012-2017 Oracle Corporation
+ * Copyright (C) 2012-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +25 @@
  */
 
-#ifndef ___iprt_formats_ext2_h
-#define ___iprt_formats_ext2_h
+#ifndef ___iprt_formats_ext_h
+#define ___iprt_formats_ext_h
 
 #include <iprt/types.h>
@@ -33 +33 @@
 
 /*
- * The filesystem structures are from http://wiki.osdev.org/Ext2 and
- * http://www.nongnu.org/ext2-doc/ext2.html
+ * The filesystem structures were retrieved from:
+ * https://www.kernel.org/doc/html/latest/filesystems/ext4/index.html
  */
 
 /**
- * Ext2 superblock.
+ * Ext superblock.
  *
  * Everything is stored little endian on the disk.
  */
-typedef struct EXT2SUPERBLOCK
+typedef struct EXTSUPERBLOCK
 {
     /** Total number of inodes in the filesystem. */
@@ -96 +96 @@
     /** Reserved fields. */
     uint8_t     abReserved[940];
-} EXT2SUPERBLOCK;
-AssertCompileSize(EXT2SUPERBLOCK, 1024);
-/** Pointer to an ext2 super block. */
-typedef EXT2SUPERBLOCK *PEXT2SUPERBLOCK;
-/** Pointer to a const ext2 super block. */
-typedef EXT2SUPERBLOCK const *PCEXT2SUPERBLOCK;
+} EXTSUPERBLOCK;
+AssertCompileSize(EXTSUPERBLOCK, 1024);
+/** Pointer to an ext super block. */
+typedef EXTSUPERBLOCK *PEXTSUPERBLOCK;
+/** Pointer to a const ext super block. */
+typedef EXTSUPERBLOCK const *PCEXTSUPERBLOCK;
 
-/** Ext2 signature. */
-#define EXT2_SIGNATURE      UINT16_C(0xef53)
+/** Ext signature. */
+#define EXT_SIGNATURE      UINT16_C(0xef53)
 /** Clean filesystem state. */
-#define EXT2_STATE_CLEAN    UINT16_C(0x0001)
+#define EXT_STATE_CLEAN    UINT16_C(0x0001)
 /** Error filesystem state. */
-#define EXT2_STATE_ERRORS   UINT16_C(0x0002)
+#define EXT_STATE_ERRORS   UINT16_C(0x0002)
 
 /**
  * Block group descriptor.
  */
-typedef struct EXT2BLOCKGROUPDESC
+typedef struct EXTBLOCKGROUPDESC
 {
     /** Block address of the block bitmap. */
@@ -131 +131 @@
     /** Reserved. */
     uint8_t     abReserved[12];
-} EXT2BLOCKGROUPDESC;
-AssertCompileSize(EXT2BLOCKGROUPDESC, 32);
+} EXTBLOCKGROUPDESC;
+AssertCompileSize(EXTBLOCKGROUPDESC, 32);
 /** Pointer to an ext block group descriptor. */
-typedef EXT2BLOCKGROUPDESC *PEXT2BLOCKGROUPDESC;
+typedef EXTBLOCKGROUPDESC *PEXTBLOCKGROUPDESC;
 
 #endif

trunk/include/iprt/mangling.h

@@ -965 +965 @@
 # define RTFsQueryType                                  RT_MANGLER(RTFsQueryType)
 # define RTFsTypeName                                   RT_MANGLER(RTFsTypeName)
-# define RTFsExt2VolOpen                                RT_MANGLER(RTFsExt2VolOpen)
+# define RTFsExtVolOpen                                 RT_MANGLER(RTFsExtVolOpen)
 # define RTFsFatVolOpen                                 RT_MANGLER(RTFsFatVolOpen)
 # define RTFsFatVolFormat                               RT_MANGLER(RTFsFatVolFormat)