Ticket #9672: fixv4.patch

headers/private/storage/Partition.h

@@ -68 +68 @@
                                     type_code* _type) const;
             status_t            GetMountPoint(BPath* mountPoint) const;
 
-            dev_t               Mount(const char* mountPoint = NULL,
+            status_t            Mount(const char* mountPoint = NULL,
                                     uint32 mountFlags = 0,
-                                    const char* parameters = NULL);
+                                    const char* parameters = NULL,
+                                    dev_t* devicePointer = NULL);
             status_t            Unmount(uint32 unmountFlags = 0);
 
     // Hierarchy Info

src/kits/storage/disk_device/Partition.cpp

@@ -518 +518 @@
     \param mountFlags Currently only \c B_MOUNT_READ_ONLY is defined, which
            forces the volume to be mounted read-only.
     \param parameters File system specific mount parameters.
+    \param devicePointer Reference to the mounted filesystem for the programs
+            interested in it
     \return \c B_OK, if everything went fine, another error code otherwise.
 */
-dev_t
+status_t
 BPartition::Mount(const char* mountPoint, uint32 mountFlags,
-    const char* parameters)
+    const char* parameters, dev_t* devicePointer)
 {
     if (IsMounted() || !ContainsFileSystem())
         return B_BAD_VALUE;
@@ -568 +570 @@
         rmdir(mountPoint);
     }
 
+    // Update reference to device
+    if(devicePointer != NULL)
+        *devicePointer = device;
+
     // update object, if successful
-    if (device >= 0)
+    if (device >= 0) {
         error = Device()->Update();
-
-    return device;
+        return error;
+    }
+    return B_ERROR;
 }