Changeset 66742 in vbox for trunk/src/VBox/Runtime/common/fs

Timestamp:

May 2, 2017 9:37:06 AM (8 years ago)

Author:

vboxsync

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

115148

Message:

fatvfs,iso9660vfs,vfsbase: Sorted volume reference fun. Volumes will be freed now.

Location:

trunk/src/VBox/Runtime/common/fs

Files:

• fatvfs.cpp (modified) (4 diffs)
• iso9660vfs.cpp (modified) (6 diffs)

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

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP RTLOGGROUP_FS
 #include "internal/iprt.h"
 #include <iprt/fsvfs.h>
@@ -37 +38 @@
 #include <iprt/file.h>
 #include <iprt/err.h>
+#include <iprt/log.h>
 #include <iprt/mem.h>
 #include <iprt/path.h>
@@ -3651 +3653 @@
 
     PRTFSFATDIR pNewDir;
-    int rc = RTVfsNewDir(&g_rtFsFatDirOps, sizeof(*pNewDir), 0 /*fFlags*/, pThis->hVfsSelf, NIL_RTVFSLOCK /*use volume lock*/,
-                         phVfsDir, (void **)&pNewDir);
+    int rc = RTVfsNewDir(&g_rtFsFatDirOps, sizeof(*pNewDir), pParentDir ? 0 : RTVFSDIR_F_NO_VFS_REF,
+                         pThis->hVfsSelf, NIL_RTVFSLOCK /*use volume lock*/, phVfsDir, (void **)&pNewDir);
     if (RT_SUCCESS(rc))
     {
@@ -3772 +3774 @@
 {
     PRTFSFATVOL pThis = (PRTFSFATVOL)pvThis;
+    LogFlow(("rtFsFatVol_Close(%p)\n", pThis));
     int rc = rtFsFatClusterMap_Destroy(pThis);
 

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

@@ -918 +918 @@
 {
     RT_NOREF(pvThis, pszSubDir, fMode, phVfsDir);
-RTAssertMsg2("%s: %s\n", __FUNCTION__, pszSubDir);
-    return VERR_NOT_IMPLEMENTED;
+    return VERR_WRITE_PROTECT;
 }
 
@@ -941 +940 @@
 {
     RT_NOREF(pvThis, pszSymlink, pszTarget, enmType, phVfsSymlink);
-RTAssertMsg2("%s: %s\n", __FUNCTION__, pszSymlink);
-    return VERR_NOT_SUPPORTED;
+    return VERR_WRITE_PROTECT;
 }
 
@@ -952 +950 @@
 {
     RT_NOREF(pvThis, pszEntry, fType);
-RTAssertMsg2("%s: %s\n", __FUNCTION__, pszEntry);
-    return VERR_NOT_IMPLEMENTED;
+    return VERR_WRITE_PROTECT;
 }
 
@@ -972 +969 @@
  */
 static DECLCALLBACK(int) rtFsIso9660Dir_ReadDir(void *pvThis, PRTDIRENTRYEX pDirEntry, size_t *pcbDirEntry,
-                                            RTFSOBJATTRADD enmAddAttr)
+                                                RTFSOBJATTRADD enmAddAttr)
 {
     RT_NOREF(pvThis, pDirEntry, pcbDirEntry, enmAddAttr);
@@ -1190 +1187 @@
 
     PRTFSISO9660DIR pNewDir;
-    int rc = RTVfsNewDir(&g_rtFsIso9660DirOps, sizeof(*pNewDir), 0 /*fFlags*/, pThis->hVfsSelf, NIL_RTVFSLOCK /*use volume lock*/,
-                         phVfsDir, (void **)&pNewDir);
+    int rc = RTVfsNewDir(&g_rtFsIso9660DirOps, sizeof(*pNewDir), pParentDir ? 0 : RTVFSDIR_F_NO_VFS_REF,
+                         pThis->hVfsSelf, NIL_RTVFSLOCK /*use volume lock*/, phVfsDir, (void **)&pNewDir);
     if (RT_SUCCESS(rc))
     {
@@ -1241 +1238 @@
 {
     PRTFSISO9660VOL pThis = (PRTFSISO9660VOL)pvThis;
-    LogFlow(("rtFsIso9660Vol_Close(%p)\n", pThis));
+    Log(("rtFsIso9660Vol_Close(%p)\n", pThis));
 
     if (pThis->hVfsRootDir != NIL_RTVFSDIR)