Attachment 158857 Details for Bug 300694

[patch] [PATCH] If the new mount option "rwonly" is not given, automatically fall back to read-only mount if volume is dirty

ntfs-mount-dirty-fallback-to-ro+rwonly.diff (text/plain), 2.70 KB, created by Bernhard Kaindl on 2007-08-21 23:53:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernhard Kaindl

Created: 2007-08-21 23:53:58 UTC

Size: 2.70 KB

patch

obsolete

>--- include/ntfs-3g/volume.h
>+++ include/ntfs-3g/volume.h
>@@ -67,6 +67,8 @@
> #define MS_FORCE     0x10000000
> #endif
> 
>+#define MS_RWONLY    0x20000000
>+
> /* Forward declaration */
> typedef struct _ntfs_volume ntfs_volume;
> 
>--- src/ntfs-3g.c
>+++ src/ntfs-3g.c
>@@ -114,6 +114,7 @@ typedef struct {
> 	unsigned int dmask;
> 	ntfs_fuse_streams_interface streams;
> 	BOOL ro;
>+	BOOL rwonly;
> 	BOOL show_sys_files;
> 	BOOL silent;
> 	BOOL force;
>@@ -1670,6 +1671,8 @@ static ntfs_volume *ntfs_open(const char
> 		flags |= MS_EXCLUSIVE;
> 	if (ctx->ro)
> 		flags |= MS_RDONLY;
>+	if (ctx->rwonly)
>+		flags |= MS_RWONLY;
> 	if (ctx->noatime)
> 		flags |= MS_NOATIME;
> 	if (ctx->force)
>@@ -1731,6 +1734,14 @@ static char *parse_mount_options(const c
> 			}
> 			ctx->ro = TRUE;
> 			strcat(ret, "ro,");
>+		} else if (!strcmp(opt, "rwonly")) {
>+			if (val) {
>+				ntfs_log_error("The option 'rwonly' does not "
>+						"take arguments.\n");
>+				goto err_exit;
>+			}
>+			ctx->rwonly = TRUE;
>+			strcat(ret, "rwonly,");
> 		} else if (!strcmp(opt, "noatime")) {
> 			if (val) {
> 				ntfs_log_error("'noatime' option should not "
>@@ -2230,6 +2241,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 @@ static const char *dirty_volume_msg =
> "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,13 +144,18 @@ 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);
>-			
>+			/* If rwonly has not been given, try fallback to ro: */
>+			if (!(flags & MS_RWONLY)) {
>+				ntfs_log_error("%s", rdonly_fallback_msg);
>+				flags |= MS_RDONLY;
>+				goto retry_mount;
>+			}
> 			return NULL;
> 		} else
> 			ntfs_log_error("WARNING: Forced mount, unclean volume "

Actions: View | Diff

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