[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.126,1.127

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28406/ntfsprogs

Modified Files:
	mkntfs.c 
Log Message:
Adjust $LogFile size for 3.1 volumes which got much bigger (the small 
$LogFile became a performance bootleneck for the increasingly faster disks)


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- mkntfs.c	7 Jan 2006 15:30:19 -0000	1.126
+++ mkntfs.c	8 Jan 2006 14:54:55 -0000	1.127
@@ -3921,11 +3921,30 @@ static BOOL mkntfs_initialize_rl_logfile
 		g_logfile_size = 512LL * 1024;		/*   -> 512kiB	*/
 	else if (volume_size <= 200LL * 1024 * 1024)	/* < 200MiB	*/
 		g_logfile_size = 2048LL * 1024;		/*   -> 2MiB	*/
-	else if (volume_size >= 400LL << 20)		/* > 400MiB	*/
-		g_logfile_size = 4 << 20;		/*   -> 4MiB	*/
-	else
-		g_logfile_size = (volume_size / 100) &
-				~(g_vol->cluster_size - 1);
+	else if (g_vol->major_ver < 3) {
+		if (volume_size >= 400LL << 20)		/* > 400MiB	*/
+			g_logfile_size = 4 << 20;	/*   -> 4MiB	*/
+		else
+			g_logfile_size = (volume_size / 100) &
+					~(g_vol->cluster_size - 1);
+	} else	{
+		/* 
+		 * FIXME: The $LogFile size is 64 MiB upwards from 12GiB but
+		 * the "200" divider below apparently approximates "100" or
+		 * some other walue as the volume size decreases. For example:
+		 *      Volume size   LogFile size    Ratio
+		 *	  8799808        46048       191.100
+		 *	  8603248        45072       190.877
+		 *	  7341704        38768       189.375
+		 *	  6144828        32784       187.433
+		 *	  4192932        23024       182.111
+		 */
+		if (volume_size >= 12LL << 30)		/* > 12GiB	*/
+			g_logfile_size = 64 << 20;	/*   -> 64MiB	*/
+		else
+			g_logfile_size = (volume_size / 200) &
+					~(g_vol->cluster_size - 1);
+	}
 	j = g_logfile_size / g_vol->cluster_size;
 	while (g_rl_logfile[0].lcn + j >= g_vol->nr_clusters) {
 		/*