Changeset 76216 in vbox for trunk/src/VBox/Runtime/common/vfs

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

127483

Message:

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

File:

• trunk/src/VBox/Runtime/common/vfs/vfsmount.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/common/vfs/vfsmount.cpp

@@ -45 +45 @@
 #include <iprt/formats/iso9660.h>
 #include <iprt/formats/udf.h>
-#include <iprt/formats/ext2.h>
+#include <iprt/formats/ext.h>
 
 
@@ -352 +352 @@
 
 /**
- * Check if the given bootsector is an HPFS boot sector.
+ * Check if the given bootsector is an ext2/3/4 super block.
  *
  * @returns true if NTFS, false if not.
  * @param   pSuperBlock         The ext2 superblock.
  */
-static bool rtVfsMountIsExt2(PCEXT2SUPERBLOCK pSuperBlock)
-{
-    if (RT_LE2H_U16(pSuperBlock->u16Signature) != EXT2_SIGNATURE)
+static bool rtVfsMountIsExt(PCEXTSUPERBLOCK pSuperBlock)
+{
+    if (RT_LE2H_U16(pSuperBlock->u16Signature) != EXT_SIGNATURE)
         return false;
 
@@ -365 +365 @@
     if (cShift > 54)
     {
-        Log2(("rtVfsMountIsExt2: cBitsShiftLeftBlockSize=%#x: out of range\n", cShift));
+        Log2(("rtVfsMountIsExt: cBitsShiftLeftBlockSize=%#x: out of range\n", cShift));
         return false;
     }
@@ -372 +372 @@
     if (cShift > 54)
     {
-        Log2(("rtVfsMountIsExt2: cBitsShiftLeftFragmentSize=%#x: out of range\n", cShift));
+        Log2(("rtVfsMountIsExt: cBitsShiftLeftFragmentSize=%#x: out of range\n", cShift));
         return false;
     }
@@ -435 +435 @@
     }
 
-    AssertCompile(sizeof(*pBuf) >= 1024 + sizeof(EXT2SUPERBLOCK));
-    if (rtVfsMountIsExt2((PCEXT2SUPERBLOCK)&pBuf->ab[1024]))
-    {
-        Log(("RTVfsMount: Detected ISO-9660 or UDF.\n"));
-        return RTFsExt2VolOpen(hVfsFileIn, fFlags, 0 /*fExt2Flags*/, phVfs, pErrInfo);
+    AssertCompile(sizeof(*pBuf) >= 1024 + sizeof(EXTSUPERBLOCK));
+    if (rtVfsMountIsExt((PCEXTSUPERBLOCK)&pBuf->ab[1024]))
+    {
+        Log(("RTVfsMount: Detected EXT2/3/4.\n"));
+        return RTFsExtVolOpen(hVfsFileIn, fFlags, 0 /*fExt2Flags*/, phVfs, pErrInfo);
     }