[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools mkntfs.c,1.26,1.27

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv14055

Modified Files:
	mkntfs.c 
Log Message:
Fix stupid bugs in calculating the clusters per mft/index record values.


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -U2 -r1.26 -r1.27
--- mkntfs.c	2001/06/12 20:13:35	1.26
+++ mkntfs.c	2001/06/12 21:58:32	1.27
@@ -1867,6 +1867,5 @@
 			return -EINVAL;
 		}
-		r->clusters_per_index_block = -(1 << (ffs(opt.index_block_size)
-				- 1));
+		r->clusters_per_index_block = -(ffs(opt.index_block_size) - 1);
 		if ((1 << -r->clusters_per_index_block) !=
 				opt.index_block_size)
@@ -3213,6 +3212,5 @@
 			opt.cluster_size;
 	else {
-		bs->clusters_per_mft_record = -(1 << (ffs(opt.mft_record_size)
-				- 1));
+		bs->clusters_per_mft_record = -(ffs(opt.mft_record_size) - 1);
 		if ((1 << -bs->clusters_per_mft_record) != opt.mft_record_size)
 			err_exit("BUG: calculated clusters_per_mft_record "
@@ -3227,6 +3225,5 @@
 			opt.cluster_size;
 	else {
-		bs->clusters_per_index_block = -(1 << (ffs(opt.index_block_size)
-				- 1));
+		bs->clusters_per_index_block = -(ffs(opt.index_block_size) - 1);
 		if ((1 << -bs->clusters_per_index_block) !=
 				opt.index_block_size)