Ticket #8449: fs_func_c_final.patch

src/add-ons/kernel/file_systems/ntfs/fs_func.c

@@ -48 +48 @@
     char label[256];
 } identify_cookie;
 
+bool
+is_device_read_only(const char *device)
+{
+    bool isReadOnly = FALSE;
+    int fd = open(device, O_RDONLY | O_NOCACHE);
+
+    if (fd >= 0) {
+        device_geometry geometry;
+        
+        if (ioctl(fd, B_GET_GEOMETRY, &geometry) == 0) {
+            if (geometry.read_only) {
+                isReadOnly = TRUE;
+            }
+        }
+
+        close(fd);
+    }
+    return isReadOnly;
+}
 
 static status_t
 get_node_type(ntfs_inode* ni, int* _type)
@@ -234 +253 @@
         "true"), "true") == 0;
     unload_driver_settings(handle);
 
-    if (ns->ro || (flags & B_MOUNT_READ_ONLY) != 0) {
+    if (ns->ro || (flags & B_MOUNT_READ_ONLY) != 0 || is_device_read_only(device)) {
         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)
         result = B_NO_ERROR;