Attachment 158813 Details for Bug 300694

[patch] Patch to automatically fall back to read-only mount if volume is dirty

ntfs-mount-dirty-fallback-to-ro.diff (text/plain), 1.58 KB, created by Bernhard Kaindl on 2007-08-21 18:06:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernhard Kaindl

Created: 2007-08-21 18:06:58 UTC

Size: 1.58 KB

patch

obsolete

>--- src/ntfs-3g.c
>+++ src/ntfs-3g.c
>@@ -2230,6 +2230,12 @@ int main(int argc, char *argv[])
> 	if (!ntfs_open(opts.device, opts.mnt_point, use_blkdev))
> 		goto err_out;
> 	
>+	/* If ntfs_open fell back to MS_RDONLY, mount the filesystem read-only. */
>+	if (ctx->vol->flags & MS_RDONLY && ctx->ro != TRUE) {
>+		ctx->ro = TRUE;
>+		strcat(parsed_options, ",ro");
>+	}
>+
> 	if (use_blkdev) {
> 	    set_fuseblk_options(parsed_options);
> 	    set_user_mount_option(parsed_options, uid);
>--- src/utils.c
>+++ src/utils.c
>@@ -88,6 +88,8 @@
> "Volume is scheduled for check. Please boot into Windows TWICE, or\n"
> "use the 'force' mount option. For example type on the command line:\n";
> 
>+static const char *rdonly_fallback_msg ="\nMounting the volume read-only for now.\n";
>+
> static const char *forced_mount_msg =
> "\n"
> "            mount -t ntfs-3g %s %s -o force\n"
>@@ -118,6 +120,7 @@ ntfs_volume *utils_mount_volume(const ch
> {
> 	ntfs_volume *vol;
> 
>+retry_mount:
> 	vol = ntfs_mount(volume, flags);
> 	if (!vol) {
> 		
>@@ -141,14 +144,17 @@ ntfs_volume *utils_mount_volume(const ch
> 		return NULL;
> 	}
> 
>-	if (vol->flags & VOLUME_IS_DIRTY) {
>+	if (!(flags & MS_RDONLY) && vol->flags & VOLUME_IS_DIRTY) {
> 		if (!force) {
> 			ntfs_log_error("%s", dirty_volume_msg);
> 			ntfs_log_error(forced_mount_msg, volume, mntpoint, 
> 				       volume, mntpoint);
> 			ntfs_umount(vol, FALSE);
>-			
>-			return NULL;
>+
>+			ntfs_log_error("%s", rdonly_fallback_msg);
>+				fflush(stderr);
>+			flags |= MS_RDONLY;
>+			goto retry_mount;
> 		} else
> 			ntfs_log_error("WARNING: Forced mount, unclean volume "
> 				       "information is ignored.\n");

Actions: View | Diff

Attachments on bug 300694: 157696 | 158806 | 158813 | 158857