[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.130,1.131

[Anton A. <an...@us...>]

Changes by: antona

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

Modified Files:
	mkntfs.c 
Log Message:
Fixes to previous commit.


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- mkntfs.c	3 Feb 2006 22:19:20 -0000	1.130
+++ mkntfs.c	3 Feb 2006 23:11:35 -0000	1.131
@@ -3745,8 +3745,8 @@ static BOOL mkntfs_override_vol_params(n
 	 * "inode size" can be specified on other Linux/Unix file systems.
 	 */
 	vol->mft_record_size = 1024;
-	if (vol->mft_record_size < vol->sector_size)
-		vol->mft_record_size = vol->sector_size;
+	if (vol->mft_record_size < opts.sector_size)
+		vol->mft_record_size = opts.sector_size;
 	if (vol->mft_record_size > (unsigned long)page_size)
 		ntfs_log_warning("Mft record size (%u bytes) exceeds system "
 				"page size (%li bytes).  You will not be able "
@@ -3763,8 +3763,8 @@ static BOOL mkntfs_override_vol_params(n
 	 * FIXME: Should we make the index record size to be user specifiable?
 	 */
 	vol->indx_record_size = 4096;
-	if (vol->indx_record_size < vol->sector_size)
-		vol->indx_record_size = vol->sector_size;
+	if (vol->indx_record_size < opts.sector_size)
+		vol->indx_record_size = opts.sector_size;
 	if (vol->indx_record_size > (unsigned long)page_size)
 		ntfs_log_warning("Index record size (%u bytes) exceeds system "
 				"page size (%li bytes).  You will not be able "
@@ -3893,7 +3893,8 @@ static BOOL mkntfs_initialize_rl_mft(voi
 		g_mft_zone_end = g_mft_zone_end >> 3;	/* 12.5% */
 		break;
 	}
-	ntfs_log_debug("MFT zone size = %lldkiB\n", g_mft_zone_end / 1024);
+	ntfs_log_debug("MFT zone size = %lldkiB\n", g_mft_zone_end <<
+			g_vol->cluster_size_bits >> 10 /* >> 10 == / 1024 */);
 	/*
 	 * The mft zone begins with the mft data attribute, not at the beginning
 	 * of the device.