From 8824fbe7aeb6d768c1da74bb70d07280e907dd01 Mon Sep 17 00:00:00 2001 From: szaka Date: Wed, 22 Aug 2007 19:59:45 +0000 Subject: [PATCH] Ignore the volume dirty bit because its real meaning is "check the volume" (set by chkdsk, ntfsresize, ntfsfix) and this is what ext2, ext3, ext4, reiserfs and xfs do in similar cases. The fact of the real dirtiness is stored in the NTFS logfile which is already checked for. --- src/ntfs-3g.8.in | 7 +++---- src/utils.c | 17 ----------------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/ntfs-3g.8.in b/src/ntfs-3g.8.in index efc23e72..c4824a9a 100644 --- a/src/ntfs-3g.8.in +++ b/src/ntfs-3g.8.in @@ -109,10 +109,9 @@ option. Please see more information about this topic at http://ntfs-3g.org/support.html#locale .TP .B force -Force mount even if the volume is scheduled for consistency check or -the logfile is unclean. The logfile will be unconditionally cleared -in the latter case. Use this option with caution and for your own -responsibility. +Force the mounting even if the NTFS logfile is unclean. The logfile +will be unconditionally cleared. Use this option with caution and for +your own responsibility. .TP .B show_sys_files Show the system files in directory listings. diff --git a/src/utils.c b/src/utils.c index d866b559..d066a0d1 100644 --- a/src/utils.c +++ b/src/utils.c @@ -84,10 +84,6 @@ static const char *fakeraid_msg = "different device under /dev/mapper/, (e.g. /dev/mapper/nvidia_eahaabcc1)\n" "to mount NTFS. Please see the 'dmraid' documentation for help.\n"; -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 *forced_mount_msg = "\n" " mount -t ntfs-3g %s %s -o force\n" @@ -141,19 +137,6 @@ ntfs_volume *utils_mount_volume(const char *volume, const char *mntpoint, return NULL; } - if (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; - } else - ntfs_log_error("WARNING: Forced mount, unclean volume " - "information is ignored.\n"); - } - return vol; }