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

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

Changes by: antona

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

Modified Files:
	mkntfs.c 
Log Message:
Fix nr_sectors / sector_size problems with previous commit.


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -U2 -r1.25 -r1.26
--- mkntfs.c	2001/06/12 20:02:50	1.25
+++ mkntfs.c	2001/06/12 20:13:35	1.26
@@ -2625,5 +2625,11 @@
 				err_exit("You must specify the number of "
 						"sectors.\n");
-			opt.nr_sectors = sbuf.st_blocks;
+			if (opt.sector_size)
+				opt.nr_sectors = ((__s64)sbuf.st_blocks << 9) /
+						opt.sector_size;
+			else {
+				opt.nr_sectors = sbuf.st_blocks;
+				opt.sector_size = 512;
+			}
 		}
 		fprintf(stderr, "mkntfs forced anyway.\n");