Ticket #8449: fs_func_c.patch

.c

@@ -48 +48 @@
     char label[256];
 } identify_cookie;
 
+status_t
+checkReadOnly(const char *dev)
+{
+    status_t check = B_NO_ERROR;        // NO ERROR during READ_ONLY check
+    int fd = open(dev, O_RDONLY | O_NOCACHE);
+    if (fd < 0)
+        check = errno;
+
+    if (fd >= 0) {
+        // opening succeeded
+        device_geometry geometry;
+        
+        if (!ioctl(fd, B_GET_GEOMETRY, &geometry)) {
+            if (geometry.read_only) {
+                check = B_OK;           // READ_ONLY device
+            }
+        }
+        
+        // close the descriptor
+        close(fd);
+    }
+    return check;                       // go the default way
+}
 
 static status_t
 get_node_type(ntfs_inode* ni, int* _type)
@@ -204 +227 @@
     void *handle;
     unsigned long mountFlags = 0;
     status_t result = B_NO_ERROR;
+    status_t rdOnlyCheck = B_NO_ERROR;
 
     TRACE("fs_mount - ENTER\n");
 
@@ -234 +258 @@
         "true"), "true") == 0;
     unload_driver_settings(handle);
 
-    if (ns->ro || (flags & B_MOUNT_READ_ONLY) != 0) {
+    // checking whether the device is READ_ONLY or not
+    rdOnlyCheck = checkReadOnly(device);
+    
+    // set the status given by checkReadOnly, can be B_NO_ERROR or ERRNO set during function call
+    if(rdOnlyCheck != B_OK)
+        result = rdOnlyCheck;
+    
+    if (ns->ro || (flags & B_MOUNT_READ_ONLY) != 0 || rdOnlyCheck == B_OK) {
         mountFlags |= MS_RDONLY;
         ns->flags |= B_FS_IS_READONLY;
     }
-
+    
     // TODO: this does not take read-only volumes into account!
     ns->ntvol = utils_mount_volume(device, mountFlags, true);
     if (ns->ntvol != NULL)