Changeset 76256 in vbox for trunk/src/VBox

Timestamp:

Dec 16, 2018 8:36:28 PM (6 years ago)

Author:

vboxsync

Message:

Runtime/formats/ext: Add more structures

Location:

trunk/src/VBox/Runtime/common

Files:

• fs/extvfs.cpp (modified) (3 diffs)
• vfs/vfsmount.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/fs/extvfs.cpp

@@ -126 +126 @@
     }
 
-    uint64_t           offRead = (pThis->iSbBlock + 1) * pThis->cbBlock;
-    EXTBLOCKGROUPDESC  BlkDesc;
+    uint64_t            offRead = (pThis->iSbBlock + 1) * pThis->cbBlock;
+    EXTBLOCKGROUPDESC32 BlkDesc;
     int rc = RTVfsFileReadAt(pThis->hVfsBacking, offRead, &BlkDesc, sizeof(BlkDesc), NULL);
     if (RT_SUCCESS(rc))
@@ -133 +133 @@
         pBlkGrpDesc->offStart = pThis->iSbBlock + (uint64_t)iBlkGrp * pThis->cBlocksPerGroup * pThis->cbBlock;
         pBlkGrpDesc->offLast  = pBlkGrpDesc->offStart + pThis->cBlocksPerGroup * pThis->cbBlock;
-        rc = RTVfsFileReadAt(pThis->hVfsBacking, BlkDesc.offBlockBitmap * pThis->cbBlock,
+        rc = RTVfsFileReadAt(pThis->hVfsBacking, BlkDesc.offBlockBitmapLow * pThis->cbBlock,
                              &pBlkGrpDesc->abBlockBitmap[0], cbBlockBitmap, NULL);
     }
@@ -279 +279 @@
             /** @todo Convert to host endianess. */
 #endif
-            if (SuperBlock.u16FilesystemState == EXT_STATE_ERRORS)
+            if (SuperBlock.u16FilesystemState == EXT_SB_STATE_ERRORS)
                 rc = RTERRINFO_LOG_SET(pErrInfo, VERR_FILESYSTEM_CORRUPT, "EXT_STATE_ERRORS");
             else
             {
                 pThis->iSbBlock = SuperBlock.iBlockOfSuperblock;
-                pThis->cbBlock = 1024 << SuperBlock.cBitsShiftLeftBlockSize;
+                pThis->cbBlock = 1024 << SuperBlock.cLogBlockSize;
                 pThis->cBlocksPerGroup = SuperBlock.cBlocksPerGroup;
-                pThis->cBlockGroups = SuperBlock.cBlocksTotal / pThis->cBlocksPerGroup;
+                pThis->cBlockGroups = SuperBlock.cBlocksTotalLow / pThis->cBlocksPerGroup;
 
                 /* Load first block group descriptor. */

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

@@ -359 +359 @@
 static bool rtVfsMountIsExt(PCEXTSUPERBLOCK pSuperBlock)
 {
-    if (RT_LE2H_U16(pSuperBlock->u16Signature) != EXT_SIGNATURE)
-        return false;
-
-    uint32_t cShift = RT_LE2H_U32(pSuperBlock->cBitsShiftLeftBlockSize);
+    if (RT_LE2H_U16(pSuperBlock->u16Signature) != EXT_SB_SIGNATURE)
+        return false;
+
+    uint32_t cShift = RT_LE2H_U32(pSuperBlock->cLogBlockSize);
     if (cShift > 54)
     {
-        Log2(("rtVfsMountIsExt: cBitsShiftLeftBlockSize=%#x: out of range\n", cShift));
-        return false;
-    }
-
-    cShift = RT_LE2H_U32(pSuperBlock->cBitsShiftLeftFragmentSize);
+        Log2(("rtVfsMountIsExt: cLogBlockSize=%#x: out of range\n", cShift));
+        return false;
+    }
+
+    cShift = RT_LE2H_U32(pSuperBlock->cLogClusterSize);
     if (cShift > 54)
     {
-        Log2(("rtVfsMountIsExt: cBitsShiftLeftFragmentSize=%#x: out of range\n", cShift));
+        Log2(("rtVfsMountIsExt: cLogClusterSize=%#x: out of range\n", cShift));
         return false;
     }