[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-ntfs-cvs
Subject:    [Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsfix.8.in, 1.15,
From:       Anton Altaparmakov <aia21 () delta357 ! server4you ! de>
Date:       2006-12-11 10:41:36
Message-ID: E1GtibI-00006t-VQ () delta357 ! server4you ! de
[Download RAW message or body]


Changes by: aia21

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv359/ntfsprogs

Modified Files:
	ntfsfix.8.in ntfsfix.c ntfsresize.c 
Log Message:
Szaka prefers to have the lofgile reset and dirty bit setting done even if they
are already done so remove the conditionals I added.


Index: ntfsfix.8.in
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.8.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ntfsfix.8.in	6 Feb 2006 01:05:01 -0000	1.15
+++ ntfsfix.8.in	11 Dec 2006 10:41:34 -0000	1.16
@@ -14,14 +14,14 @@ is a utility that fixes some common NTFS
 .B ntfsfix
 is
 .B NOT
-a Linux version of chkdsk. It only repairs some fundamental NTFS
+a Linux version of chkdsk.  It only repairs some fundamental NTFS
 inconsistencies, resets the NTFS journal file and schedules an NTFS consistency
 check for the first boot into Windows.
 .sp
 You may run
 .B ntfsfix
 on an NTFS volume if you think it was damaged by Windows or some other way 
-and it can't be mounted.
+and it cannot be mounted.
 .SH OPTIONS
 Below is a summary of all the options that
 .B ntfsfix

Index: ntfsfix.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- ntfsfix.c	9 Dec 2006 11:27:37 -0000	1.35
+++ ntfsfix.c	11 Dec 2006 10:41:34 -0000	1.36
@@ -259,8 +259,8 @@ static int set_dirty_flag(ntfs_volume *v
 		return -1;
 	}
 	vol->flags = flags;
-	ntfs_log_info(OK);
 	NVolSetWasDirty(vol);
+	ntfs_log_info(OK);
 	return 0;
 }
 

Index: ntfsresize.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- ntfsresize.c	3 Dec 2006 08:59:57 -0000	1.127
+++ ntfsresize.c	11 Dec 2006 10:41:34 -0000	1.128
@@ -2289,25 +2289,19 @@ static ntfs_volume *mount_volume(void)
  */
 static void prepare_volume_fixup(ntfs_volume *vol)
 {
-	/* No need to schedule chkdsk if it is already scheduled. */
-	if (!NVolWasDirty(vol)) {
-		printf("Schedule chkdsk for NTFS consistency check at Windows "
-			"boot time ...\n");
-		vol->flags |= VOLUME_IS_DIRTY;
-		if (ntfs_volume_write_flags(vol, vol->flags))
-			perr_exit("Failed to set the volume dirty");
-		NVolSetWasDirty(vol);
-		if (vol->dev->d_ops->sync(vol->dev) == -1)
-			perr_exit("Failed to sync device");
-	}
-	/* No need to empty the journal if it is already empty. */
-	if (!NVolLogFileEmpty(vol)) {
-		printf("Resetting $LogFile ... (this might take a while)\n");
-		if (ntfs_logfile_reset(vol))
-			perr_exit("Failed to reset $LogFile");
-		if (vol->dev->d_ops->sync(vol->dev) == -1)
-			perr_exit("Failed to sync device");
-	}
+	printf("Schedule chkdsk for NTFS consistency check at Windows boot "
+			"time ...\n");
+	vol->flags |= VOLUME_IS_DIRTY;
+	if (ntfs_volume_write_flags(vol, vol->flags))
+		perr_exit("Failed to set the volume dirty");
+	NVolSetWasDirty(vol);
+	if (vol->dev->d_ops->sync(vol->dev) == -1)
+		perr_exit("Failed to sync device");
+	printf("Resetting $LogFile ... (this might take a while)\n");
+	if (ntfs_logfile_reset(vol))
+		perr_exit("Failed to reset $LogFile");
+	if (vol->dev->d_ops->sync(vol->dev) == -1)
+		perr_exit("Failed to sync device");
 }
 
 static void set_disk_usage_constraint(ntfs_resize_t *resize)


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Linux-NTFS-cvs mailing list
Linux-NTFS-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-ntfs-cvs
[prev in list] [next in list] [prev in thread] [next in thread]