linux-ntfs-cvs — List for CVS checkins and comments.

[Linux-NTFS-cvs] CVS: dynamic-disk/test ldminfo.c,1.24,1.25

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk/test
In directory usw-pr-cvs1:/tmp/cvs-serv9020/test

Modified Files:
	ldminfo.c 
Log Message:
reinstate Jakob's parse guid, because I wasn't listening
more renames


Index: ldminfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/ldminfo.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -U2 -r1.24 -r1.25
--- ldminfo.c	10 Apr 2002 15:42:01 -0000	1.24
+++ ldminfo.c	11 Apr 2002 14:27:39 -0000	1.25
@@ -139,24 +139,39 @@
 	int copy  = 0;
 	int help  = 0;
+	int ver   = 0;
 	struct block_device bdev;
 
 	for (a = 1; a < argc; a++) {
-		if	(strcmp (argv[a], "--info")  == 0) info++;
-		else if	(strcmp (argv[a], "--dump")  == 0) dump++;
-		else if (strcmp (argv[a], "--copy")  == 0) copy++;
-		else if (strcmp (argv[a], "--debug") == 0) debug++;
-		else if (strcmp (argv[a], "--help")  == 0) help++;
+		if	(strcmp (argv[a], "--info")    == 0) info++;
+		else if	(strcmp (argv[a], "--dump")    == 0) dump++;
+		else if (strcmp (argv[a], "--copy")    == 0) copy++;
+		else if (strcmp (argv[a], "--debug")   == 0) debug++;
+		else if (strcmp (argv[a], "--help")    == 0) help++;
+		else if (strcmp (argv[a], "--version") == 0) ver++;
 		else continue;
 		argv[a][0] = 0;
 	}
 
+	/*
+	if (help || ver) {
+		printf ("\nGDB is free software, covered by the GNU General Public License, and you are\n");
+		printf ("welcome to change it and/or distribute copies of it under certain conditions.\n");
+	}
+	*/
+
 	if (help || (argc - info - dump - copy - debug) < 2) {
-		printf ("\nUsage:\n    %s [options] device ...\n", argv[0]);
+		printf ("\nUsage:\n    %s [options] device ...\n", basename (argv[0]));
 		printf ("\nOptions:\n"
-			"    --info    A concise list of partitions (default)\n"
-			"    --dump    The contents of the database in detail\n"
-			"    --copy    Write the database to a file\n"
-			"    --debug   Display lots of debugging information\n"
-			"    --help    Show this short help\n\n");
+			"    --info     A concise list of partitions (default)\n"
+			"    --dump     The contents of the database in detail\n"
+			"    --copy     Write the database to a file\n"
+			"    --debug    Display lots of debugging information\n"
+			"    --version  display the version number\n"
+			"    --help     Show this short help\n\n");
+		return 1;
+	}
+
+	if (ver) {
+		printf ("\nldminfo v0.0.6-pre\n\n");
 		return 1;
 	}

[Linux-NTFS-cvs] CVS: dynamic-disk/linux/fs/partitions ldm.c,1.67,1.68 ldm.h,1.39,1.40

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv6178/linux/fs/partitions

Modified Files:
	ldm.c ldm.h 
Log Message:
lots of minor formatting changes
guid code swapped again.  if it doesn't work, I want to see examples
all the offsets are ranged checked against known safe values
added a check to see if the database was in an inconsistant state
shortened a few names for convenience


Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -U2 -r1.67 -r1.68
--- ldm.c	22 Mar 2002 16:02:07 -0000	1.67
+++ ldm.c	10 Apr 2002 15:41:59 -0000	1.68
@@ -8,18 +8,18 @@
  * Documentation is available at http://linux-ntfs.sf.net/ldm
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS source
- * in the file COPYING); if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program (in the main directory of the source in the file COPYING); if
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA  02111-1307  USA
  */
 
@@ -96,38 +96,13 @@
 		level = LDM_LVL_NONE;
 
-	printk("%s(%s) (%s, %d) %s(): %s", prefix[level], label[level],
+	printk("%s(%s) (%s, %d) %s(): %s\n", prefix[level], label[level],
 		file, line, function, buf);
 }
 
-/**
- * ldm_parse_hexbyte - Convert a ASCII hex number to a byte
- * @src: Pointer to at least 2 characters to convert.
- *
- * Return: integer in the range [0,255] on success
- *         -1 on error.
- */
-static int ldm_parse_hexbyte (const u8 *src)
-{
-	unsigned int x;		/* For correct wrapping */
-	int h;
-
-	/* high part */
-	if      ((x = src[0] - '0') <= '9'-'0') h = x;
-	else if ((x = src[0] - 'a') <= 'f'-'a') h = x+10;
-	else if ((x = src[0] - 'A') <= 'F'-'A') h = x+10;
-	else return -1;
-	h <<= 4;
-
-	/* low part */
-	if ((x = src[1] - '0') <= '9'-'0') return h | x;
-	if ((x = src[1] - 'a') <= 'f'-'a') return h | (x+10);
-	if ((x = src[1] - 'A') <= 'F'-'A') return h | (x+10);
-	return -1;
-}
 
 /**
  * ldm_parse_guid - Convert GUID from ASCII to binary
- * @src:  36 char string on the form fa50ff2b-f2e8-45de-83fa-65417f2f49ba
- * @dest: memory block to hold binary GUID (16 bytes)
+ * @src:   36 char string of the form fa50ff2b-f2e8-45de-83fa-65417f2f49ba
+ * @dest:  memory block to hold binary GUID (16 bytes)
  *
  * NB not NULL terminated!
@@ -138,37 +113,15 @@
 static BOOL ldm_parse_guid (const u8 *src, u8 *dest)
 {
-	static const int size[] = { 4, 2, 2, 2, 6 };
-	int i, j, v;
-
-	if (src[8]  != '-' || src[13] != '-' ||
-	    src[18] != '-' || src[23] != '-')
-		return FALSE;
-
-	for (j = 0; j < 5; j++, src++)
-		for (i = 0; i < size[j]; i++, src+=2, *dest++ = v)
-			if ((v = ldm_parse_hexbyte(src)) < 0)
-				return FALSE;
-
-	return TRUE;
-}
-// FIXME: Why doesn't this work ??
-/**
- *
-static BOOL ldm_parse_guid (const u8 *src, u8 *dest)
-{
 	u16 *tmp = (u16*)dest;
 
 	DEBUG_ON (!src || !dest);
 
-	if ((src[8]  != '-') || (src[13] != '-') ||
+	if ((src[8]  != '-') || (src[13] != '-') ||	/* Check alignment */
 	    (src[18] != '-') || (src[23] != '-'))
 		return FALSE;
 
-	return (
-	    8 == sscanf (src, "%04hx%04hx-%04hx-%04hx-%04hx-%04hx%04hx%04hx",
-	                 tmp, tmp+1, tmp+2, tmp+3, tmp+4, tmp+5, tmp+6, tmp+7)
-	);
+	return (8 == sscanf (src, "%04hx%04hx-%04hx-%04hx-%04hx-%04hx%04hx%04hx",
+	                 tmp, tmp+1, tmp+2, tmp+3, tmp+4, tmp+5, tmp+6, tmp+7));
 }
-*/
 
 /**
@@ -189,5 +142,5 @@
 	if (MAGIC_PRIVHEAD != BE64 (data)) {
 		ldm_error ("Cannot find PRIVHEAD structure. LDM database is"
-			" corrupt. Aborting.\n");
+			" corrupt. Aborting.");
 		return FALSE;
 	}
@@ -195,7 +148,8 @@
 	ph->ver_major = BE16 (data + 0x000C);
 	ph->ver_minor = BE16 (data + 0x000E);
+	// FIXME move checks to validate_*, maybe later coalesce?
 	if ((ph->ver_major != 2) || (ph->ver_minor != 11)) {
 		ldm_error ("Expected PRIVHEAD version %d.%d, got %d.%d."
-			" Aborting.\n", 2, 11, ph->ver_major, ph->ver_minor);
+			" Aborting.", 2, 11, ph->ver_major, ph->ver_minor);
 		return FALSE;
 	}
@@ -205,5 +159,5 @@
 		/* Warn the user and continue, carefully */
 		ldm_info ("Database is normally %u bytes, it claims to "
-			"be %llu bytes.\n", LDM_DB_SIZE,
+			"be %llu bytes.", LDM_DB_SIZE,
 			(unsigned long long)ph->config_size );
 	}
@@ -212,14 +166,14 @@
 	if ((ph->logical_disk_size == 0) ||
 	    (ph->logical_disk_start + ph->logical_disk_size > ph->config_start)) {
-		ldm_error ("PRIVHEAD disk size doesn't match real disk size\n");
+		ldm_error ("PRIVHEAD disk size doesn't match real disk size");
 		return FALSE;
 	}
 
 	if (!ldm_parse_guid (data + 0x0030, ph->disk_id)) {
-		ldm_error ("PRIVHEAD contains an invalid GUID.\n");
+		ldm_error ("PRIVHEAD contains an invalid GUID.");
 		return FALSE;
 	}
 
-	ldm_debug ("Parsed PRIVHEAD successfully.\n");
+	ldm_debug ("Parsed PRIVHEAD successfully.");
 	return TRUE;
 }
@@ -246,5 +200,5 @@
 
 	if (MAGIC_TOCBLOCK != BE64 (data)) {
-		ldm_crit ("Cannot find TOCBLOCK, database may be corrupt.\n");
+		ldm_crit ("Cannot find TOCBLOCK, database may be corrupt.");
 		return FALSE;
 	}
@@ -256,5 +210,5 @@
 	if (strncmp (toc->bitmap1_name, TOC_BITMAP1,
 			sizeof (toc->bitmap1_name)) != 0) {
-		ldm_crit ("TOCBLOCK's first bitmap is '%s', should be '%s'.\n",
+		ldm_crit ("TOCBLOCK's first bitmap is '%s', should be '%s'.",
 				TOC_BITMAP1, toc->bitmap1_name);
 		return FALSE;
@@ -266,9 +220,9 @@
 	if (strncmp (toc->bitmap2_name, TOC_BITMAP2,
 			sizeof (toc->bitmap2_name)) != 0) {
-		ldm_crit ("TOCBLOCK's second bitmap is '%s', should be '%s'.\n",
+		ldm_crit ("TOCBLOCK's second bitmap is '%s', should be '%s'.",
 				TOC_BITMAP2, toc->bitmap2_name);
 		return FALSE;
 	}
-	ldm_debug ("Parsed TOCBLOCK successfully.\n");
+	ldm_debug ("Parsed TOCBLOCK successfully.");
 	return TRUE;
 }
@@ -282,6 +236,5 @@
  * the in-memory vmdb structure @vm with the obtained information.
  *
- * N.B.  The *_start, *_size and *_seq values returned in @vm have not been
- *       checked for validity, so make sure to check them when using them.
+ * N.B.  The *_start, *_size and *_seq values will be range-checked later.
  *
  * Return: TRUE   @vm contains VMDB info
@@ -293,12 +246,13 @@
 
 	if (MAGIC_VMDB != BE32 (data)) {
-		ldm_crit ("Cannot find the VMDB, database may be corrupt.\n");
+		ldm_crit ("Cannot find the VMDB, database may be corrupt.");
 		return FALSE;
 	}
+
 	vm->ver_major = BE16 (data + 0x12);
 	vm->ver_minor = BE16 (data + 0x14);
 	if ((vm->ver_major != 4) || (vm->ver_minor != 10)) {
 		ldm_error ("Expected VMDB version %d.%d, got %d.%d. "
-			"Aborting.\n", 4, 10, vm->ver_major, vm->ver_minor);
+			"Aborting.", 4, 10, vm->ver_major, vm->ver_minor);
 		return FALSE;
 	}
@@ -308,5 +262,5 @@
 	vm->last_vblk_seq = BE32 (data + 0x04);
 
-	ldm_debug ("Parsed VMDB successfully.\n");
+	ldm_debug ("Parsed VMDB successfully.");
 	return TRUE;
 }
@@ -324,5 +278,5 @@
  */
 static BOOL ldm_compare_privheads (const struct privhead *ph1,
-				  const struct privhead *ph2)
+				   const struct privhead *ph2)
 {
 	DEBUG_ON (!ph1 || !ph2);
@@ -348,5 +302,5 @@
  */
 static BOOL ldm_compare_tocblocks (const struct tocblock *toc1,
-				  const struct tocblock *toc2)
+				   const struct tocblock *toc2)
 {
 	DEBUG_ON (!toc1 || !toc2);
@@ -391,10 +345,10 @@
 	data = read_dev_sector (bdev, 0, &sect);
 	if (!data) {
-		ldm_crit ("Disk read failed.\n");
+		ldm_crit ("Disk read failed.");
 		return FALSE;
 	}
 
 	if (*(u16*) (data + 0x01FE) != cpu_to_le16 (MSDOS_LABEL_MAGIC)) {
-		ldm_debug ("No MS-DOS partition table found.\n");
+		ldm_debug ("No MS-DOS partition table found.");
 		goto out;
 	}
@@ -408,7 +362,7 @@
 
 	if (result)
-		ldm_debug ("Parsed partition table successfully.\n");
+		ldm_debug ("Parsed partition table successfully.");
 	else
-		ldm_debug ("Found an MS-DOS partition table, not a dynamic disk.\n");
+		ldm_debug ("Found an MS-DOS partition table, not a dynamic disk.");
 out:
 	put_dev_sector(sect);
@@ -428,20 +382,20 @@
  */
 static BOOL ldm_validate_privheads (struct block_device *bdev,
-	unsigned long first_sector, struct privhead *ph1)
+	unsigned long first_sector, struct privhead *ph1, struct gendisk *hd, unsigned long minor)
 {
-	struct privhead *ph[3] = { ph1, NULL, NULL };
-	static const int off[3] = { OFF_PRIVHEAD1, OFF_PRIVHEAD2, OFF_PRIVHEAD3 };
+	static const int off[3] = { OFF_PRIV1, OFF_PRIV2, OFF_PRIV3 };
+	struct privhead *ph[3] = { ph1 };
 	Sector sect;
 	u8 *data;
 	BOOL result = FALSE;
+	long num_sects;
 	int i;
 
 	DEBUG_ON (!bdev || !ph1);
 
-	// FIXME coalesce
-	ph[1] = kmalloc (sizeof (*ph[1]), GFP_KERNEL);
+	ph[1] = kmalloc (sizeof (*ph[1]), GFP_KERNEL); // FIXME coalesce?
 	ph[2] = kmalloc (sizeof (*ph[2]), GFP_KERNEL);
 	if (!ph[1] || !ph[2]) {
-		ldm_crit ("Out of memory.\n");
+		ldm_crit ("Out of memory.");
 		goto out;
 	}
@@ -456,11 +410,29 @@
 			first_sector + ph[0]->config_start + off[i], &sect);
 		if (!data) {
-			ldm_crit ("Disk read failed.\n");
+			ldm_crit ("Disk read failed.");
 			goto out;
 		}
 		result = ldm_parse_privhead(data, ph[i]);
 		put_dev_sector (sect);
-		if (!result)
-			goto out;	/* Already logged */
+		if (!result) {
+			//if (i < 2)
+				goto out;	/* Already logged */
+			//else
+				//ldm_info ("Ignoring error");
+		}
+	}
+
+	num_sects = hd->part[(minor >> hd->minor_shift) << hd->minor_shift].nr_sects;
+
+	if ((ph[0]->config_start > num_sects) ||
+	   ((ph[0]->config_start + ph[0]->config_size) > num_sects)) {
+		ldm_crit ("Database is out of range.  Aborting."); //FIXME
+		goto out;
+	}
+
+	if ((ph[0]->logical_disk_start > ph[0]->config_start) ||
+	   ((ph[0]->logical_disk_start + ph[0]->logical_disk_size) > ph[0]->config_start)) {
+		ldm_crit ("Disk is out of range.  Aborting."); //FIXME
+		goto out;
 	}
 
@@ -468,9 +440,10 @@
 	if (!ldm_compare_privheads (ph[0], ph[1]) ||
 	    !ldm_compare_privheads (ph[0], ph[2])) {
-		ldm_crit ("Primary and backup PRIVHEADs don't match.\n");
+		ldm_crit ("Primary and backup PRIVHEADs don't match.");
 		goto out;
+		// FIXME ignore this too?
 	}
 
-	ldm_debug ("Validated PRIVHEADs successfully.\n");
+	ldm_debug ("Validated PRIVHEADs successfully.");
 	result = TRUE;
 out:
@@ -489,35 +462,37 @@
  * @bdev and return the parsed information into @toc1.
  *
+ * The offsets and sizes of the configs are range-checked against a privhead.
+ *
  * Return: TRUE   @toc1 contains validated TOCBLOCK info
  *         FALSE  @toc1 contents are undefined
  */
 static BOOL ldm_validate_tocblocks (struct block_device *bdev,
-	unsigned long base, struct tocblock *toc1)
+	unsigned long base, struct ldmdb *ldb)
 {
+	static const int off[4] = { OFF_TOCB1, OFF_TOCB2, OFF_TOCB3, OFF_TOCB4};
+	struct tocblock *tb[4];
+	struct privhead *ph;
 	Sector sect;
 	u8 *data;
-	struct tocblock *tb[4] = { toc1, NULL, NULL, NULL };
-	static const int off[4] = {
-		OFF_TOCBLOCK1, OFF_TOCBLOCK2, OFF_TOCBLOCK3, OFF_TOCBLOCK4 };
 	BOOL result = FALSE;
 	int i;
 
-	DEBUG_ON (!bdev || !toc1);
+	DEBUG_ON (!bdev || !ldb);
 
-	// FIXME coalesce
-	tb[1] = kmalloc (sizeof (*tb[1]), GFP_KERNEL);
+	ph    = &ldb->ph;
+	tb[0] = &ldb->toc;
+	tb[1] = kmalloc (sizeof (*tb[1]), GFP_KERNEL); // FIXME coalesce?
 	tb[2] = kmalloc (sizeof (*tb[2]), GFP_KERNEL);
 	tb[3] = kmalloc (sizeof (*tb[3]), GFP_KERNEL);
 	if (!tb[1] || !tb[2] || !tb[3]) {
-		ldm_crit ("Out of memory.\n");
+		ldm_crit ("Out of memory.");
 		goto out;
 	}
 
-	/* Read and parse all four toc's. */
-	for (i = 0; i < 4; i++)
+	for (i = 0; i < 4; i++)		/* Read and parse all four toc's. */
 	{
 		data = read_dev_sector (bdev, base + off[i], &sect);
 		if (!data) {
-			ldm_crit ("Disk read failed.\n");
+			ldm_crit ("Disk read failed.");
 			goto out;
 		}
@@ -525,16 +500,22 @@
 		put_dev_sector (sect);
 		if (!result)
-			goto out;
+			goto out; // FIXME already logged?
 	}
 
-	/* Compare all tocs. */
-	if (!ldm_compare_tocblocks (tb[0], tb[1]) ||
+	/* Range check the toc against a privhead. */
+	if (((tb[0]->bitmap1_start + tb[0]->bitmap1_size) > ph->config_size) ||
+	    ((tb[0]->bitmap2_start + tb[0]->bitmap2_size) > ph->config_size)) {
+		ldm_crit ("The bitmaps are out of range.  Giving up.");
+		goto out;
+	}
+
+	if (!ldm_compare_tocblocks (tb[0], tb[1]) ||	/* Compare all tocs. */
 	    !ldm_compare_tocblocks (tb[0], tb[2]) ||
 	    !ldm_compare_tocblocks (tb[0], tb[3])) {
-		ldm_crit ("The TOCBLOCKs don't match.\n");
+		ldm_crit ("The TOCBLOCKs don't match.");
 		goto out;
 	}
 
-	ldm_debug ("Validated TOCBLOCKs successfully.\n");
+	ldm_debug ("Validated TOCBLOCKs successfully.");
 	result = TRUE;
 out:
@@ -558,18 +539,43 @@
  */
 static BOOL ldm_validate_vmdb (struct block_device *bdev, unsigned long base,
-				struct vmdb *vm)
+			       struct ldmdb *ldb)
 {
 	Sector sect;
 	u8 *data;
-	BOOL result;
+	BOOL result = FALSE;
+	struct vmdb *vm;
+	struct tocblock *toc;
+
+	DEBUG_ON (!bdev || !ldb);
 
-	DEBUG_ON (!bdev || !vm);
+	vm  = &ldb->vm;
+	toc = &ldb->toc;
 
 	data = read_dev_sector (bdev, base + OFF_VMDB, &sect);
 	if (!data) {
-		ldm_crit ("Disk read failed.\n");
+		ldm_crit ("Disk read failed.");
 		return FALSE;
 	}
-	result = ldm_parse_vmdb(data, vm);
+
+	if (!ldm_parse_vmdb(data, vm))
+		goto out;				/* Already logged */
+
+	/* Are there uncommitted transactions? */
+	if (BE16(data + 0x10) != 0x01) {
+		ldm_crit ("Database is not in a consistant state.  Aborting.");
+		goto out;
+	}
+
+	if (vm->vblk_offset != 512)
+		ldm_info ("VBLKs start at offset 0x%04x.", vm->vblk_offset);
+
+	if ((vm->vblk_size * vm->last_vblk_seq) != (toc->bitmap1_size * 512)) {
+		ldm_error ("VMDM and TOCBLOCK don't agree on config size."
+			   "Aborting.");
+		goto out;
+	}
+
+	result = TRUE;
+out:
 	put_dev_sector (sect);
 	return result;
@@ -597,5 +603,5 @@
 	}
 
-	ldm_debug("Search for vblk #%llu failed!\n", (unsigned long long) id);
+	ldm_debug("Search for vblk #%llu failed!", (unsigned long long) id);
 	return NULL;
 }
@@ -626,9 +632,9 @@
 	disk_minor = (minor >> hd->minor_shift) << hd->minor_shift;
 	if ((start < 1) || ((start + size) > hd->part[disk_minor].nr_sects)) {
-		ldm_crit ("Partition exceeds physical disk. Aborting.\n");
+		ldm_crit ("Partition exceeds physical disk. Aborting.");
 		return FALSE;
 	}
 	add_gd_partition (hd, minor, start, size);
-	ldm_debug ("Created partition successfully.\n");
+	ldm_debug ("Created partition successfully.");
 	return TRUE;
 }
@@ -714,9 +720,10 @@
 	}
 
-	printk("\n");
+	printk ("\n");
 
 	return TRUE;
 }
 
+
 /**
  * ldm_out_of_range - Check that an offset will not overflow the buffer
@@ -793,5 +800,5 @@
 			tmp = (tmp << 8) | *block++;
 	else
-		ldm_error ("Illegal length %d.\n", length);
+		ldm_error ("Illegal length %d.", length);
 
 	return tmp;
@@ -823,5 +830,5 @@
 	length = block[0];
 	if (length >= buflen) {
-		ldm_error ("String too long for buffer (%d/%d). Truncating.\n",
+		ldm_error ("String too long for buffer (%d/%d). Truncating.",
 			length, buflen);
 		length = buflen - 1;
@@ -1009,5 +1016,5 @@
 		sizeof (disk->alt_name));
 	if (!ldm_parse_guid (buffer + 0x19 + r_name, disk->disk_id)) {
-		ldm_error ("VBLK DISK contains an invalid GUID.\n");
+		ldm_error ("VBLK DISK contains an invalid GUID.");
 		return FALSE;
 	}
@@ -1245,8 +1252,8 @@
 
 	if (result)
-		ldm_debug ("Parsed VBLK 0x%llx (type: 0x%02x) ok.\n",
+		ldm_debug ("Parsed VBLK 0x%llx (type: 0x%02x) ok.",
 			 (unsigned long long) vb->obj_id, vb->type);
 	else
-		ldm_error ("Failed to parse VBLK 0x%llx (type: 0x%02x).\n",
+		ldm_error ("Failed to parse VBLK 0x%llx (type: 0x%02x).",
 			vb->obj_id, vb->type);
 
@@ -1254,4 +1261,5 @@
 }
 
+
 /**
  * ldm_ldmdb_add - Adds a VBLK entry to the ldmdb structure
@@ -1301,8 +1309,8 @@
 }
 
-// FIXME: better descriptions.
 /**
- * ldm_frag_[find,listfree] - Obvious fraglist helper functions.
+ * ldm_frag_find - Obvious fraglist helper functions.
  * @list: List of fragments.
+ * FIXME: better descriptions.
  */
 static struct frags *ldm_frag_find(list_t *list, u32 group)
@@ -1335,5 +1343,4 @@
 }
 
-// FIXME: desc.
 /**
  * ldm_frag_add - Adds a VBLK fragment to fragment list.
@@ -1344,4 +1351,5 @@
  *
  * Process fragment data and copy to fragment list.
+ * FIXME: desc.
  *
  * Returns:	TRUE	fragment added.
@@ -1359,5 +1367,5 @@
 	/* Sanity check vblk header. */
 	if (vbh->nrec > FRAG_MAX || vbh->rec >= vbh->nrec) {
-		ldm_error ("Invalid VBLK header.\n");
+		ldm_error ("Invalid VBLK header.");
 		bad = TRUE; // FIXME shouldn't we return?
 	}
@@ -1370,5 +1378,5 @@
 			// FIXME has this been logged already?
 		} else if (vbh->nrec != f->nrec || FRAG_GETMAP(f, vbh->rec)) {
-			ldm_error ("Inconsistent VBLK fragments!\n");
+			ldm_error ("Inconsistent VBLK fragments!");
 			bad = TRUE;
 		}
@@ -1379,5 +1387,5 @@
 		f = kmalloc(sizeof (*f) + nrec * size, GFP_KERNEL);
 		if (!f) {
-			ldm_crit ("Out of memory.\n");
+			ldm_crit ("Out of memory.");
 			return -1;
 		}
@@ -1404,5 +1412,4 @@
 }
 
-// FIXME: desc.
 /**
  * ldm_frag_commit - Parse complete multipart VBLK records and add to ldmdb.
@@ -1411,4 +1418,5 @@
  * @ldb:  ldmdb.
  *
+ * FIXME: desc.
  *
  * Returns:	TRUE
@@ -1433,5 +1441,5 @@
 		for (i = 0; i < f->nrec; i++)
 			if (!FRAG_GETMAP(f, i)) {
-				ldm_error ("VBLK group %lu is incomplete.\n",
+				ldm_error ("VBLK group %lu is incomplete.",
 					(unsigned long)f->group);
 				goto entry_done;
@@ -1442,5 +1450,5 @@
 			vb = kmalloc (sizeof(*vb), GFP_KERNEL);
 		if (!vb) {
-			ldm_crit ("Out of memory.\n");
+			ldm_crit ("Out of memory.");
 			result = FALSE;
 			goto out;
@@ -1464,5 +1472,4 @@
 }
 
-// FIXME: This function is ugly, it should be rewritten.
 /**
  * ldm_get_vblks - Read and cache the VMDB in the ldmdb
@@ -1480,4 +1487,5 @@
 		struct ldmdb *ldb)
 {
+	// FIXME: This function is ugly, it should be rewritten.
 	const int perbuf = 512 / ldb->vm.vblk_size;
 	const int skip   = ldb->vm.vblk_offset / 512;
@@ -1501,5 +1509,5 @@
 		data = read_dev_sector (bdev, base + OFF_VMDB + s, &sect);
 		if (!data) {
-			ldm_crit ("Disk read failed in get buffers.\n");
+			ldm_crit ("Disk read failed in get buffers.");
 			goto out;
 		}
@@ -1512,5 +1520,5 @@
 
 			if (!ldm_parse_vblk_head (block, &vbh)) {
-				ldm_error ("not a VBLK\n");
+				ldm_error ("not a VBLK");
 				goto out;
 			}
@@ -1530,5 +1538,5 @@
 				vb = kmalloc (sizeof(*vb), GFP_KERNEL);
 			if (!vb) {
-				ldm_crit ("Out of memory.\n");
+				ldm_crit ("Out of memory.");
 				goto out;
 			}
@@ -1624,5 +1632,4 @@
 	unsigned long first_sector, int first_minor)
 {
-	struct tocblock *toc;
 	struct ldmdb    *ldb;
 	struct vblk     *disk;
@@ -1636,13 +1643,12 @@
 		return 0;
 
-	toc = kmalloc (sizeof (*toc), GFP_KERNEL);
 	ldb = kmalloc (sizeof (*ldb), GFP_KERNEL);
-	if (!toc || !ldb) {
-		ldm_crit ("Out of memory.\n");
+	if (!ldb) {
+		ldm_crit ("Out of memory.");
 		goto out;
 	}
 
 	/* Parse and check privheads. */
-	if (!ldm_validate_privheads (bdev, first_sector, &ldb->ph))
+	if (!ldm_validate_privheads (bdev, first_sector, &ldb->ph, hd, first_minor))
 		goto out;
 
@@ -1651,6 +1657,6 @@
 
 	/* Parse and check tocs and vmdb. */
-	if (!ldm_validate_tocblocks (bdev, base, toc) ||
-	    !ldm_validate_vmdb      (bdev, base, &ldb->vm))
+	if (!ldm_validate_tocblocks (bdev, base, ldb) ||
+	    !ldm_validate_vmdb      (bdev, base, ldb))
 	    	goto out;
 
@@ -1667,5 +1673,5 @@
 
 	if (!ldm_get_vblks (bdev, base, ldb)) {
-		ldm_crit ("get buffers failed\n");
+		ldm_crit ("get buffers failed");
 		goto cleanup;
 	}
@@ -1673,5 +1679,5 @@
 	disk = ldm_get_disk_objid (ldb);
 	if (!disk) {
-		ldm_crit ("can't find this disk\n");
+		ldm_crit ("can't find this disk");
 		goto cleanup;
 	}
@@ -1680,5 +1686,5 @@
 	if (ldm_create_data_partitions (hd, first_sector, first_minor,
 				      ldb, disk)) {
-		ldm_debug ("Parsed LDM database successfully.\n");
+		ldm_debug ("Parsed LDM database successfully.");
 		err = 1;
 	}
@@ -1692,7 +1698,5 @@
 	ldm_free_vblks(&ldb->v_part);
 out:
-	kfree (toc);
 	kfree (ldb);
-
 	return err;
 }

Index: ldm.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -U2 -r1.39 -r1.40
--- ldm.h	12 Mar 2002 14:07:07 -0000	1.39
+++ ldm.h	10 Apr 2002 15:42:00 -0000	1.40
@@ -89,16 +89,16 @@
 #define LDM_DB_SIZE		2048		/* Size in sectors (= 1MiB). */
 
-#define OFF_PRIVHEAD1		6		/* Offset of the first privhead
+#define OFF_PRIV1		6		/* Offset of the first privhead
 						   relative to the start of the
 						   device in sectors */
 
 /* Offsets to structures within the LDM Database in sectors. */
-#define OFF_PRIVHEAD2		1856		/* Backup private headers. */
-#define OFF_PRIVHEAD3		2047
+#define OFF_PRIV2		1856		/* Backup private headers. */
+#define OFF_PRIV3		2047
 
-#define OFF_TOCBLOCK1		1		/* Tables of contents. */
-#define OFF_TOCBLOCK2		2
-#define OFF_TOCBLOCK3		2045
-#define OFF_TOCBLOCK4		2046
+#define OFF_TOCB1		1		/* Tables of contents. */
+#define OFF_TOCB2		2
+#define OFF_TOCB3		2045
+#define OFF_TOCB4		2046
 
 #define OFF_VMDB		17		/* List of partitions. */
@@ -223,4 +223,5 @@
 struct ldmdb {
 	struct privhead ph;
+	struct tocblock toc;
 	struct vmdb     vm;
 	list_t v_dgrp;

[Linux-NTFS-cvs] CVS: dynamic-disk/test dump.c,1.11,1.12 ldminfo.c,1.23,1.24 ldminfo.h,1.13,1.14

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk/test
In directory usw-pr-cvs1:/tmp/cvs-serv6178/test

Modified Files:
	dump.c ldminfo.c ldminfo.h 
Log Message:
lots of minor formatting changes
guid code swapped again.  if it doesn't work, I want to see examples
all the offsets are ranged checked against known safe values
added a check to see if the database was in an inconsistant state
shortened a few names for convenience


Index: dump.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/dump.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- dump.c	27 Feb 2002 17:35:40 -0000	1.11
+++ dump.c	10 Apr 2002 15:42:00 -0000	1.12
@@ -290,10 +290,10 @@
  * dump_database -
  */
-void dump_database (char *name, struct tocblock *toc, struct ldmdb *ldb)
+void dump_database (char *name, struct ldmdb *ldb)
 {
 	printf ("Device: %s\n\n", name);
 
 	dump_privhead (&ldb->ph);
-	dump_tocblock (toc);
+	dump_tocblock (&ldb->toc);
 	dump_vmdb (ldb);
 	dump_disks (ldb);

Index: ldminfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/ldminfo.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -U2 -r1.23 -r1.24
--- ldminfo.c	27 Feb 2002 17:35:40 -0000	1.23
+++ ldminfo.c	10 Apr 2002 15:42:01 -0000	1.24
@@ -83,5 +83,5 @@
  */
 int ldm_partition2 (struct gendisk *hd, struct block_device *bdev, struct ldmdb *ldb,
-		struct tocblock *toc, int first_minor)
+		    int first_minor)
 {
 	struct vblk   *disk;
@@ -92,5 +92,5 @@
 		return -1;
 
-	if (!ldm_validate_privheads (bdev, 0, &ldb->ph))
+	if (!ldm_validate_privheads (bdev, 0, &ldb->ph, hd, first_minor))
 		return -1;
 
@@ -99,6 +99,6 @@
 
 	/* Parse and check tocs and vmdb. */
-	if (!ldm_validate_tocblocks (bdev, base, toc) ||
-	    !ldm_validate_vmdb      (bdev, base, &ldb->vm))
+	if (!ldm_validate_tocblocks (bdev, base, ldb) ||
+	    !ldm_validate_vmdb      (bdev, base, ldb))
 	    	return -1;
 
@@ -164,5 +164,4 @@
 	for (a = 1; a < argc; a++) {
 		long long size;
-		struct tocblock *toc;
 		struct ldmdb     ldb; //FIXME move to heap
 
@@ -194,10 +193,4 @@
 		INIT_LIST_HEAD(&ldb.v_part);
 
-		toc = kmalloc (sizeof (*toc), GFP_KERNEL);
-		if (!toc) {
-			printk (LDM_CRIT "Not enough memory for required buffers.\n");
-			goto free_structs;
-		}
-
 		memset (hardsect_size, 0, sizeof (hardsect_size));
 		memset (blk_size,      0, sizeof (blk_size));
@@ -211,8 +204,8 @@
 		bdev.bd_dev = kdev_val(drive);	 /* hack (bd_dev isn't a kdev_t) */
 
-		ldm_partition2 (&hd_gendisk, &bdev, &ldb, toc, minor + 1);
+		ldm_partition2 (&hd_gendisk, &bdev, &ldb, minor + 1);
 
 		if (dump)
-			dump_database (argv[a], toc, &ldb);
+			dump_database (argv[a], &ldb);
 		else
 			dump_info     (argv[a], maxminor);
@@ -223,6 +216,4 @@
 		ldm_free_vblks(&ldb.v_comp);
 		ldm_free_vblks(&ldb.v_part);
-free_structs:
-		kfree (toc);
 close:
 		close (device);

Index: ldminfo.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/ldminfo.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- ldminfo.h	27 Feb 2002 17:35:40 -0000	1.13
+++ ldminfo.h	10 Apr 2002 15:42:01 -0000	1.14
@@ -75,5 +75,5 @@
 };
 
-void dump_database (char *name, struct tocblock *toc, struct ldmdb *ldb);
+void dump_database (char *name, struct ldmdb *ldb);
 void copy_database (char *file, int fd, long long size);
 struct buffer_head * ldm_bread (kdev_t dev, int block, int size);
@@ -81,7 +81,7 @@
 BOOL ldm_create_partition (struct gendisk *hd, int minor, int start, int size);
 BOOL ldm_create_data_partitions (struct gendisk *hd, unsigned long first_sector, int first_minor, const struct ldmdb *ldb, const struct vblk *disk);
-int ldm_validate_privheads (struct block_device *bdev, unsigned long base, const struct privhead *ph1);
-int ldm_validate_tocblocks (struct block_device *bdev, unsigned long base, struct tocblock *toc1);
-int ldm_validate_vmdb (struct block_device *bdev, unsigned long base, struct vmdb *vm);
+int ldm_validate_privheads (struct block_device *bdev, unsigned long base, const struct privhead *ph1, struct gendisk *hd, unsigned long first_minor);
+int ldm_validate_tocblocks (struct block_device *bdev, unsigned long base, struct ldmdb *ldb);
+int ldm_validate_vmdb (struct block_device *bdev, unsigned long base, struct ldmdb *ldb);
 int ldm_get_buffers (struct block_device *bdev, unsigned long base, struct vmdb *vm, list_t *lh_bh, list_t *lh_vl);
 struct vblk * ldm_get_disk_objid (const struct ldmdb *ldb);

[Linux-NTFS-cvs] CVS: dynamic-disk/linux/fs/partitions ldm.c,1.66,1.67

[Jakob K. <jk...@us...>]

Changes by: jkemi

Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv28158

Modified Files:
	ldm.c 
Log Message:
fix typo

Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -U2 -r1.66 -r1.67
--- ldm.c	12 Mar 2002 14:07:07 -0000	1.66
+++ ldm.c	22 Mar 2002 16:02:07 -0000	1.67
@@ -699,5 +699,5 @@
 		/* Try to get parent volume */
 		v = ldm_find_vblk(&ldb->v_volu, c->vblk.comp.parent_id);
-		if (v == NULL);
+		if (v == NULL)
 			continue;
 
@@ -1321,5 +1321,5 @@
 
 /**
- * ldm_frag_listfree - 
+ * ldm_frag_listfree -
  */
 static void ldm_frag_listfree(list_t *list)
@@ -1697,3 +1697,2 @@
 	return err;
 }
-

[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools mkntfs.c,1.59,1.60 ntfsfix.c,1.21,1.22

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

Changes by: antona

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

Modified Files:
	mkntfs.c ntfsfix.c 
Log Message:
Final tidyups.


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -U2 -r1.59 -r1.60
--- mkntfs.c	12 Mar 2002 22:00:44 -0000	1.59
+++ mkntfs.c	12 Mar 2002 22:11:02 -0000	1.60
@@ -2530,5 +2530,5 @@
 		EXEC_NAME = *argv;
 	fprintf(stderr, "%s v%s\n", EXEC_NAME, VERSION);
-	while ((c = getopt(argc, argv, "c:fnqs:vz:FL:QV")) != EOF)
+	while ((c = getopt(argc, argv, "c:fnqs:vz:CFIL:QV")) != EOF)
 		switch (c) {
 		case 'n':
@@ -2872,8 +2872,8 @@
 				err_exit("Error: cluster_size is above 4096 "
 						"bytes and compression is "
-						"requested. This is not "
+						"requested.\nThis is not "
 						"possible due to limitations "
 						"in the compression algorithm "
-						"used by Windows.\n");
+						"used by\nWindows.\n");
 			opt.enable_compression = 0;
 		}

Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -U2 -r1.21 -r1.22
--- ntfsfix.c	12 Mar 2002 22:00:44 -0000	1.21
+++ ntfsfix.c	12 Mar 2002 22:11:02 -0000	1.22
@@ -89,8 +89,8 @@
 		       "Windows mounts the partition.\nIMPORTANT: Run this "
 		       "only *after* unmounting the partition in Linux but "
-		       "*before*\nrebooting into Windows NT/2000 or you *will*"
-		       " suffer! - You have been warned!\n\n"
+		       "*before*\nrebooting into Windows NT/2000/XP or you "
+		       "*will* suffer! - You have been warned!\n\n"
 		       /* Generic copyright / disclaimer. */
-		       "Copyright (c) 2000, 2001 Anton Altaparmakov.\n\n"
+		       "Copyright (c) 2000-2002 Anton Altaparmakov.\n\n"
 		       "%s is free software, released under the GNU "
 		       "General Public License and you\nare welcome to "

[Linux-NTFS-cvs] CVS: linux-ntfs configure,1.23,1.24 configure.in,1.21,1.22

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

Changes by: antona

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

Modified Files:
	configure configure.in 
Log Message:
Forgot to bump the version number.


Index: configure
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/configure,v
retrieving revision 1.23
retrieving revision 1.24
diff -U2 -r1.23 -r1.24
--- configure	26 Jan 2002 04:32:35 -0000	1.23
+++ configure	12 Mar 2002 22:02:29 -0000	1.24
@@ -964,5 +964,5 @@
 PACKAGE=linux-ntfs
 
-VERSION=1.5.1
+VERSION=1.6.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then

Index: configure.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/configure.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -U2 -r1.21 -r1.22
--- configure.in	26 Jan 2002 03:21:07 -0000	1.21
+++ configure.in	12 Mar 2002 22:02:29 -0000	1.22
@@ -13,5 +13,5 @@
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(linux-ntfs,1.5.1)
+AM_INIT_AUTOMAKE(linux-ntfs,1.6.0)
 
 AM_MAINTAINER_MODE

[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools mkntfs.c,1.58,1.59 ntfsfix.c,1.20,1.21

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

Changes by: antona

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

Modified Files:
	mkntfs.c ntfsfix.c 
Log Message:
Fix a few small mistakes


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -U2 -r1.58 -r1.59
--- mkntfs.c	12 Mar 2002 21:48:27 -0000	1.58
+++ mkntfs.c	12 Mar 2002 22:00:44 -0000	1.59
@@ -2564,5 +2564,5 @@
 			break;
 		case 'C':
-			opt.compress = 1;
+			opt.enable_compression = 1;
 			break;
 		case 'F':
@@ -3213,5 +3213,5 @@
 	 */
 	for (i = 0; i < 16; i++) {
-		u32 file_attrs;
+		__u32 file_attrs;
 
 		m = (MFT_RECORD*)(buf + i * opt.mft_record_size);

Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -U2 -r1.20 -r1.21
--- ntfsfix.c	12 Mar 2002 21:48:27 -0000	1.20
+++ ntfsfix.c	12 Mar 2002 22:00:44 -0000	1.21
@@ -46,4 +46,6 @@
  */
 
+#include "config.h"
+
 #include <unistd.h>
 #include <stdlib.h>
@@ -63,4 +65,5 @@
 int main(int argc, char **argv)
 {
+	const char *EXEC_NAME = "NtfsFix";
 	const char *OK = "OK";
 	const char *FAILED = "FAILED";

[Linux-NTFS-cvs] CVS: linux-ntfs ChangeLog,1.28,1.29 NEWS,1.17,1.18 README,1.26,1.27 linux-ntfs.spec.in,1.37,1.38

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

Changes by: antona

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

Modified Files:
	ChangeLog NEWS README linux-ntfs.spec.in 
Log Message:
Update docs and bump version to 1.6.0.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -U2 -r1.28 -r1.29
--- ChangeLog	12 Mar 2002 21:48:27 -0000	1.28
+++ ChangeLog	12 Mar 2002 21:55:30 -0000	1.29
@@ -1,3 +1,3 @@
-12/03/2002 - Fix typo in usage.
+12/03/2002 - 1.6.0 - More mkntfs options and cleanups.
 	Fix typo in usage information of mkntfs. Thanks to Richard Russon for
 	spotting it.

Index: NEWS
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/NEWS,v
retrieving revision 1.17
retrieving revision 1.18
diff -U2 -r1.17 -r1.18
--- NEWS	26 Jan 2002 03:21:07 -0000	1.17
+++ NEWS	12 Mar 2002 21:55:30 -0000	1.18
@@ -2,11 +2,16 @@
 ============
 
-ntfsfix had two minor bugs fixed. This also should remove the compilation
-warnings in ntfsfix.c on 64-bit-pointer-size architectures.
-
 linux-ntfs should now compile and work on all architectures.
 
+Added two options to mkntfs. One to enable compression on the volume and one
+to disable content indexing. See man 8 mkntfs for details.
+
+Changed version numbers of mkntfs and ntfsfix to match linux-ntfs release.
+
 Older news
 ==========
+
+ntfsfix had two minor bugs fixed. This also should remove the compilation
+warnings in ntfsfix.c on 64-bit-pointer-size architectures.
 
 mkntfs now should be truly bug free.

Index: README
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/README,v
retrieving revision 1.26
retrieving revision 1.27
diff -U2 -r1.26 -r1.27
--- README	26 Jan 2002 02:28:29 -0000	1.26
+++ README	12 Mar 2002 21:55:30 -0000	1.27
@@ -6,5 +6,5 @@
 the Linux operating system.
 
-Linux-NTFS is copyright (c) 2000, 2001 Anton Altaparmakov.
+Linux-NTFS is copyright (c) 2000-2002 Anton Altaparmakov.
 
 All of the contents of the Linux-NTFS project are free software, released under
@@ -52,7 +52,7 @@
 The following utilities are so far implemented:
 
-NtfsFix v1.19 - Attempt to fix an NTFS partition that has been damaged by the
-Linux NTFS driver. Note that you should run it every time after you have used
-the Linux NTFS driver to write to an NTFS partition to prevent massive data
+NtfsFix - Attempt to fix an NTFS partition that has been damaged by the Linux
+NTFS driver. Note that you should run it every time after you have used the
+Linux NTFS driver to write to an NTFS partition to prevent massive data
 corruption from happening when Windows mounts the partition.
 IMPORTANT: Run this only *after* unmounting the partition in Linux but *before*
@@ -60,5 +60,5 @@
 See man 8 ntfsfix for details.
 
-mkntfs v1.55 - Format a partition with the NTFS filesystem. See man 8 mkntfs
-for command line options.
+mkntfs - Format a partition with the NTFS filesystem. See man 8 mkntfs for
+command line options.
 

Index: linux-ntfs.spec.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/linux-ntfs.spec.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -U2 -r1.37 -r1.38
--- linux-ntfs.spec.in	26 Jan 2002 03:21:07 -0000	1.37
+++ linux-ntfs.spec.in	12 Mar 2002 21:55:30 -0000	1.38
@@ -22,12 +22,12 @@
 consists of a static library and utilities. This package contains the following
 utilities:
-	NtfsFix v1.19 - Attempt to fix an NTFS partition that has been damaged
-by the Linux NTFS driver. It should be run every time after you have used the
-Linux NTFS driver to write to an NTFS partition to prevent massive data
-corruption from happening when Windows mounts the partition.
+	NtfsFix - Attempt to fix an NTFS partition that has been damaged by the
+Linux NTFS driver. It should be run every time after you have used the Linux
+NTFS driver to write to an NTFS partition to prevent massive data corruption
+from happening when Windows mounts the partition.
 IMPORTANT: Run this only *after* unmounting the partition in Linux but *before*
 rebooting into Windows NT/2000! See man 8 ntfsfix for details.
-	mkntfs v1.55 - Format a partition with the NTFS filesystem. See man 8
-mkntfs for command line options.
+	mkntfs - Format a partition with the NTFS filesystem. See man 8 mkntfs
+for command line options.
 
 %package devel
@@ -74,4 +74,7 @@
 
 %changelog
+* Tue Mar 12 2002 Anton Altaparmakov <ai...@ca...>
+- update %description text
+
 * Sat Jan 26 2002 Anton Altaparmakov <ai...@ca...>
 - update %description text

[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools mkntfs.8.in,1.6,1.7 mkntfs.c,1.57,1.58 ntfsfix.c,1.19,1.20

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

Changes by: antona

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

Modified Files:
	mkntfs.8.in mkntfs.c ntfsfix.c 
Log Message:
Change version numbers of mkntfs and ntfsfix to match linux-ntfs release and add options to mkntfs to disable content indexing on the volume and to enable compression on the volume.


Index: mkntfs.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.8.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- mkntfs.8.in	9 Nov 2001 21:30:52 -0000	1.6
+++ mkntfs.8.in	12 Mar 2002 21:48:27 -0000	1.7
@@ -1,10 +1,10 @@
 .\" -*- nroff -*-
-.\" Copyright (c) 2001 Anton Altaparmakov. All Rights Reserved.
+.\" Copyright (c) 2001,2002 Anton Altaparmakov. All Rights Reserved.
 .\" This file may be copied under the terms of the GNU Public License.
 .\" Adapted from e2fsprogs-1.19/misc/mke2fs.8.in by Theodore Ts'o.
 .\" 
-.TH MKNTFS 8 "November 2001" "Linux-NTFS version @VERSION@"
+.TH MKNTFS 8 "March 2002" "Linux-NTFS version @VERSION@"
 .SH NAME
-mkntfs \- create a NTFS 1.2 (Windows NT 4.0) file system
+mkntfs \- create a NTFS 1.2 (Windows NT/2000/XP) file system
 .SH SYNOPSIS
 .B mkntfs
@@ -43,7 +43,13 @@
 ]
 [
+.B \-C
+]
+[
 .B \-F
 ]
 [
+.B \-I
+]
+[
 .B \-V
 ]
@@ -153,4 +159,7 @@
 .B mkntfs.
 .TP
+.B \-C
+Enable compression on the volume.
+.TP
 .B \-F
 Force 
@@ -160,4 +169,9 @@
 is not a block special device, or appears to be mounted.
 .TP
+.B \-I
+Disable content indexing on the volume. (This is only meaningful on
+Windows 2000 and later. Windows NT 4.0 and earlier ignore this as they do
+not implement content indexing at all.)
+.TP
 .B \-V
 Print the version number of 
@@ -174,5 +188,5 @@
 .I device
 being formatted. However, current versions of the Linux kernel (all versions
-up to and including todays 2.4.14) either only report an even number of sectors
+up to and including todays 2.4.18) either only report an even number of sectors
 when the sector size is below 1024 bytes, which is the case for most hard
 drives today (512 bytes sector size) or they return the correct number but
@@ -196,5 +210,5 @@
 is part of the Linux-NTFS project and is available for download from 
 http://sf.net/project/showfiles.php?group_id=13956 in source (tar ball and
-rpm) and pre-compiled binary (i386 rpm) form.
+rpm) and pre-compiled binary (i386 rpm and deb) form.
 .SH SEE ALSO
 .BR badblocks (8)

Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -U2 -r1.57 -r1.58
--- mkntfs.c	12 Mar 2002 00:34:35 -0000	1.57
+++ mkntfs.c	12 Mar 2002 21:48:27 -0000	1.58
@@ -128,5 +128,4 @@
 char *buf2 = NULL;
 int buf2_size = 0;
-char *EXEC_REVISION, *EXEC_VERSION;
 int mft_bitmap_size, mft_bitmap_byte_size;
 unsigned char *mft_bitmap = NULL;
@@ -191,4 +190,8 @@
 	char quick_format;		/* -f or -Q, fast format, don't zero
 					   the volume first. */
+	char enable_compression;	/* -C, enables compression of all files
+					   on the volume by default. */
+	char disable_indexing;		/* -I, disables indexing of file
+					   contents on the volume by default. */
 	/* -V, print version and exit. */
 } opt;
@@ -2501,5 +2504,5 @@
 void usage(void)
 {
-	fprintf(stderr, "Copyright (c) 2001 Anton Altaparmakov.\n"
+	fprintf(stderr, "Copyright (c) 2001,2002 Anton Altaparmakov.\n"
 		"Create an NTFS volume on a user specified (block) device.\n"
 		"%s is free software, released under the GNU General Public "
@@ -2510,5 +2513,5 @@
 		"directory.\nUsage: %s [-s sector-size] [-c cluster-size] "
 			"[-L volume-label]\n\t[-z mft-zone-multiplier] "
-			"[-fnqvvFQV] device [number-of-sectors]\n",
+			"[-fnqvvCFIQV] device [number-of-sectors]\n",
 		EXEC_NAME, EXEC_NAME, EXEC_NAME);
 	exit(1);
@@ -2526,5 +2529,5 @@
 	if (argc && *argv)
 		EXEC_NAME = *argv;
-	fprintf(stderr, "%s v%s\n", EXEC_NAME, EXEC_VERSION);
+	fprintf(stderr, "%s v%s\n", EXEC_NAME, VERSION);
 	while ((c = getopt(argc, argv, "c:fnqs:vz:FL:QV")) != EOF)
 		switch (c) {
@@ -2560,14 +2563,18 @@
 			opt.mft_zone_multiplier = l;
 			break;
+		case 'C':
+			opt.compress = 1;
+			break;
 		case 'F':
 			opt.force = 1;
 			break;
+		case 'I':
+			opt.disable_indexing = 1;
+			break;
 		case 'L':
 			opt.volume_label = optarg;
 			break;
 		case 'V':
-			/* Print version number and exit. */
-			printf("\tUsing Linux-NTFS Library version %s\n",
-					VERSION);
+			/* Version number already printed, so just exit. */
 			exit(0);
 		default:
@@ -2626,5 +2633,4 @@
 	if (opt.upcase)
 		free(opt.upcase);
-	free(EXEC_REVISION);
 	flk.l_type = F_UNLCK;
 	err = fcntl(f, F_SETLK, &flk);
@@ -2697,5 +2703,5 @@
 int main(int argc, char **argv)
 {
-	const char *OK="OK";
+	const char *OK = "OK";
 	const char *FAILED = "FAILED";
 	int i, j, err;
@@ -2710,7 +2716,4 @@
 	NTFS_BOOT_SECTOR *bs;
 
-	EXEC_REVISION = strdup("$Revision$");
-	EXEC_VERSION = EXEC_REVISION + 11;
-	EXEC_VERSION[strlen(EXEC_VERSION) - 2] = '\0';
 	/* Initialize the random number generator with the current time. */
 	srandom(time(NULL));
@@ -2864,5 +2867,15 @@
 			 "larger cluster sizes yet.)\n");
 	Dprintf("cluster size = %i bytes\n", opt.cluster_size);
-	if (opt.cluster_size > 4096)
+	if (opt.cluster_size > 4096) {
+		if (opt.enable_compression) {
+			if (!opt.force)
+				err_exit("Error: cluster_size is above 4096 "
+						"bytes and compression is "
+						"requested. This is not "
+						"possible due to limitations "
+						"in the compression algorithm "
+						"used by Windows.\n");
+			opt.enable_compression = 0;
+		}
 		Qprintf("Warning: compression will be disabled on this volume "
 				"because it is not\nsupported when the cluster "
@@ -2870,4 +2883,5 @@
 				"limitations in the compression algorithm used "
 				"by Windows.\n");
+	}
 	/* If user didn't specify the number of clusters, determine it now. */
 	if (!opt.nr_clusters)
@@ -3199,8 +3213,17 @@
 	 */
 	for (i = 0; i < 16; i++) {
+		u32 file_attrs;
+
 		m = (MFT_RECORD*)(buf + i * opt.mft_record_size);
 		m->flags |= MFT_RECORD_IN_USE;
 		ntfs_set_bit(mft_bitmap, 0LL + i, 1);
-		add_attr_std_info(m, FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM);
+		file_attrs = FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM;
+		if (i == FILE_$root) {
+			if (opt.disable_indexing)
+				file_attrs |= FILE_ATTR_NOT_CONTENT_INDEXED;
+			if (opt.enable_compression)
+				file_attrs |= FILE_ATTR_COMPRESSED;
+		}
+		add_attr_std_info(m, file_attrs);
 		// dump_mft_record(m);
 	}

Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -U2 -r1.19 -r1.20
--- ntfsfix.c	26 Jan 2002 02:22:05 -0000	1.19
+++ ntfsfix.c	12 Mar 2002 21:48:27 -0000	1.20
@@ -4,5 +4,5 @@
  * NtfsFix - Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000,2001 Anton Altaparmakov.
+ * Copyright (c) 2000-2002 Anton Altaparmakov.
  *
  * This utility will attempt to fix a partition that has been damaged by the
@@ -63,8 +63,6 @@
 int main(int argc, char **argv)
 {
-	const char *EXEC_NAME = "NtfsFix";
 	const char *OK = "OK";
 	const char *FAILED = "FAILED";
-	char *EXEC_REVISION, *EXEC_VERSION;
 	unsigned char *b1 = NULL;
 	unsigned char *b2 = NULL;
@@ -79,7 +77,4 @@
 	MFT_REF mref;
 
-	EXEC_REVISION = strdup("$Revision$");
-	EXEC_VERSION = EXEC_REVISION + 11;
-	EXEC_VERSION[strlen(EXEC_VERSION) - 2] = '\0';
 	printf("\n");
 	if (argc != 2) {
@@ -105,7 +100,6 @@
 		       "Syntax: ntfsfix partition_or_file_name\n"
 		       "        e.g. ntfsfix /dev/hda6\n\n", EXEC_NAME,
-		       EXEC_VERSION, EXEC_NAME, EXEC_NAME);
+		       VERSION, EXEC_NAME, EXEC_NAME);
 		fprintf(stderr, "Error: incorrect syntax\n");
-		free(EXEC_REVISION);
 		exit(1);
 	}
@@ -113,5 +107,4 @@
 	if (!vol) {
 		perror("ntfs_mount() failed");
-		free(EXEC_REVISION);
 		exit(1);
 	}
@@ -434,5 +427,4 @@
 	if (vol)
 		ntfs_umount(vol, 0);
-	free(EXEC_REVISION);
 	return i;
 error_exit:

[Linux-NTFS-cvs] CVS: linux-ntfs ChangeLog,1.27,1.28

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

Changes by: antona

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

Modified Files:
	ChangeLog 
Log Message:
Change version numbers of mkntfs and ntfsfix to match linux-ntfs release and add options to mkntfs to disable content indexing on the volume and to enable compression on the volume.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -U2 -r1.27 -r1.28
--- ChangeLog	12 Mar 2002 00:34:35 -0000	1.27
+++ ChangeLog	12 Mar 2002 21:48:27 -0000	1.28
@@ -2,4 +2,8 @@
 	Fix typo in usage information of mkntfs. Thanks to Richard Russon for
 	spotting it.
+	Change version number in mkntfs and ntfsfix to match the linux-ntfs
+	release version number.
+	Added two new options to mkntfs; -I, which disables content indexing
+	on the volume and -C, which enables compression on the volume.
 
 01/02/2002 - Attempt to fix compile warnings on powerpc.

[Linux-NTFS-cvs] CVS: dynamic-disk/linux/fs/partitions ldm.c,1.65,1.66 ldm.h,1.38,1.39

[Jakob K. <jk...@us...>]

Changes by: jkemi

Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv12172

Modified Files:
	ldm.c ldm.h 
Log Message:
Fix bug in parse_comp (comp->parent_id). Remove fixed chunksize, minor cleanups.



Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -U2 -r1.65 -r1.66
--- ldm.c	12 Mar 2002 05:35:53 -0000	1.65
+++ ldm.c	12 Mar 2002 14:07:07 -0000	1.66
@@ -42,5 +42,5 @@
 			u8 n, u8 parts, u8 chunk_s, kdev_t dev);
 #else
-#    define ldm_md_addpart(...)	do {} while (0)
+#   define ldm_md_addpart(...)	do {} while (0)
 #endif
 
@@ -708,8 +708,7 @@
 		}
 		/* Register to LDM_MD */
-		//FIXME chunk size is in a vblk and must be read
 		ldm_md_addpart(v->vblk.volu.guid, c->obj_id,
-		    c->vblk.comp.type, part->partnum,
-		    c->vblk.comp.parts, COMP_CHUNKSIZE, dev);
+		    c->vblk.comp.type, part->partnum, c->vblk.comp.n_childs,
+		    c->vblk.comp.chunksize / (4096 / 512), dev);
 #endif
 	}
@@ -875,9 +874,13 @@
 
 	comp = &vb->vblk.comp;
-	comp->type  = buffer[0x18 + r_vstate];
-	comp->parts = ldm_get_vnum (buffer + 0x1D + r_vstate);
-	comp->parent_id = ldm_get_vnum (buffer + 0x2F + r_vstate);
 	ldm_get_vstr (buffer + 0x18 + r_name, comp->state,
 		sizeof (comp->state));
+	comp->type  = buffer[0x18 + r_vstate];
+	comp->n_childs = ldm_get_vnum (buffer + 0x1D + r_vstate);
+	comp->parent_id = ldm_get_vnum (buffer + 0x2D + r_child);
+
+	comp->chunksize = (r_stripe)
+		? ldm_get_vnum (buffer + 0x2E + r_parent)
+		: 0;
 
 	return TRUE;
@@ -1151,11 +1154,12 @@
 
 	volu = &vb->vblk.volu;
-	volu->partition_type = buffer[0x42 + r_size];
-	volu->size = ldm_get_vnum (buffer + 0x3E + r_child);
-	memcpy (volu->volume_state, buffer + 0x19 + r_vtype,
-		sizeof (volu->volume_state));
-	memcpy (volu->guid, buffer + 0x43 + r_size,  sizeof (volu->guid));
+
 	ldm_get_vstr (buffer + 0x18 + r_name,  volu->volume_type,
 		sizeof (volu->volume_type));
+	memcpy (volu->volume_state, buffer + 0x19 + r_vtype,
+			sizeof (volu->volume_state));
+	volu->size = ldm_get_vnum (buffer + 0x3E + r_child);
+	volu->partition_type = buffer[0x42 + r_size];
+	memcpy (volu->guid, buffer + 0x43 + r_size,  sizeof (volu->guid));
 	if (buffer[0x12] & VBLK_FLAG_VOLU_DRIVE) {
 		ldm_get_vstr (buffer + 0x53 + r_size,  volu->drive_hint,
@@ -1207,6 +1211,6 @@
 	// FIXME: this is ugly.
 	/* Compensate for vblk_head. */
-	const u8 *buffer = src - 0x10;
-	const int buflen = size + 0x10;
+	const u8 *buffer = src - VBLK_SIZE_HEAD;
+	const int buflen = size + VBLK_SIZE_HEAD;
 	BOOL result = FALSE;
 
@@ -1302,5 +1306,5 @@
  * @list: List of fragments.
  */
-static inline struct frags *ldm_frag_find(list_t *list, u32 group)
+static struct frags *ldm_frag_find(list_t *list, u32 group)
 {
 	list_t *item;
@@ -1319,5 +1323,5 @@
  * ldm_frag_listfree - 
  */
-static inline void ldm_frag_listfree(list_t *list)
+static void ldm_frag_listfree(list_t *list)
 {
 	list_t *item, *tmp;
@@ -1479,5 +1483,5 @@
 	const int skip   = ldb->vm.vblk_offset / 512;
 	const int finish = (ldb->vm.vblk_size * ldb->vm.last_vblk_seq) / 512;
-	const int body_size = ldb->vm.vblk_size - 0x10;
+	const int body_size = ldb->vm.vblk_size - VBLK_SIZE_HEAD;
 	LIST_HEAD(fraglist);
 	struct vblk *vb = NULL;
@@ -1504,5 +1508,5 @@
 		for (i = 0; i < perbuf; i++) {
 			const u8 *block = data + i*ldb->vm.vblk_size;
-			const u8 *body_data = block + 0x10;
+			const u8 *body_data = block + VBLK_SIZE_HEAD;
 			struct vblk_head vbh;
 
@@ -1526,5 +1530,5 @@
 				vb = kmalloc (sizeof(*vb), GFP_KERNEL);
 			if (!vb) {
-				ldm_crit ("Out of memory in get vblks.\n");
+				ldm_crit ("Out of memory.\n");
 				goto out;
 			}

Index: ldm.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -U2 -r1.38 -r1.39
--- ldm.h	12 Mar 2002 05:35:53 -0000	1.38
+++ ldm.h	12 Mar 2002 14:07:07 -0000	1.39
@@ -71,4 +71,6 @@
 
 /* size of a vblk's static parts */
+#define VBLK_SIZE_HEAD		16
+
 #define VBLK_SIZE_COMP		22
 #define VBLK_SIZE_PART		28
@@ -83,5 +85,4 @@
 #define COMP_BASIC		0x02		/* Basic disk */
 #define COMP_RAID		0x03		/* Raid-set */
-#define COMP_CHUNKSIZE		16		/* Chunksize in 4k units */
 
 /* Other constants. */
@@ -167,5 +168,6 @@
 	u64	parent_id;
 	u8	type;
-	u8	parts;
+	u8	n_childs;
+	u16	chunksize;
 };
 

[Linux-NTFS-cvs] CVS: dynamic-disk/linux/fs/partitions ldm.c,1.64,1.65 ldm.h,1.37,1.38

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv16411/linux/fs/partitions

Modified Files:
	ldm.c ldm.h 
Log Message:
remove some junk and start tidying Jakob's new code


Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -U2 -r1.64 -r1.65
--- ldm.c	9 Mar 2002 01:58:42 -0000	1.64
+++ ldm.c	12 Mar 2002 05:35:53 -0000	1.65
@@ -58,5 +58,4 @@
  * driver was compiled with debug enabled. Otherwise, the call turns into a NOP.
  */
-
 #ifndef CONFIG_LDM_DEBUG
 #   define ldm_debug(...)	do {} while (0)
@@ -154,5 +153,6 @@
 }
 // FIXME: Why doesn't this work ??
-/*
+/**
+ *
 static BOOL ldm_parse_guid (const u8 *src, u8 *dest)
 {
@@ -172,5 +172,4 @@
 */
 
-
 /**
  * ldm_parse_privhead - Read the LDM Database PRIVHEAD structure
@@ -251,5 +250,5 @@
 	}
 	strncpy (toc->bitmap1_name, data + 0x24, sizeof (toc->bitmap1_name));
-	toc->bitmap1_name[sizeof (toc->bitmap1_name) - 1] = (u8)'\0';
+	toc->bitmap1_name[sizeof (toc->bitmap1_name) - 1] = (u8)'\0'; // FIXME
 	toc->bitmap1_start = BE64 (data + 0x2E);
 	toc->bitmap1_size  = BE64 (data + 0x36);
@@ -262,5 +261,5 @@
 	}
 	strncpy (toc->bitmap2_name, data + 0x46, sizeof (toc->bitmap2_name));
-	toc->bitmap2_name[sizeof (toc->bitmap2_name) - 1] = (u8)'\0';
+	toc->bitmap2_name[sizeof (toc->bitmap2_name) - 1] = (u8)'\0'; // FIXME
 	toc->bitmap2_start = BE64 (data + 0x50);
 	toc->bitmap2_size  = BE64 (data + 0x58);
@@ -440,4 +439,5 @@
 	DEBUG_ON (!bdev || !ph1);
 
+	// FIXME coalesce
 	ph[1] = kmalloc (sizeof (*ph[1]), GFP_KERNEL);
 	ph[2] = kmalloc (sizeof (*ph[2]), GFP_KERNEL);
@@ -505,4 +505,5 @@
 	DEBUG_ON (!bdev || !toc1);
 
+	// FIXME coalesce
 	tb[1] = kmalloc (sizeof (*tb[1]), GFP_KERNEL);
 	tb[2] = kmalloc (sizeof (*tb[2]), GFP_KERNEL);
@@ -707,4 +708,5 @@
 		}
 		/* Register to LDM_MD */
+		//FIXME chunk size is in a vblk and must be read
 		ldm_md_addpart(v->vblk.volu.guid, c->obj_id,
 		    c->vblk.comp.type, part->partnum,
@@ -788,10 +790,10 @@
 	length = *block++;
 
-	if (length && length <= 8) {
+	if (length && length <= 8)
 		while (length--)
 			tmp = (tmp << 8) | *block++;
-	} else {
+	else
 		ldm_error ("Illegal length %d.\n", length);
-	}
+
 	return tmp;
 }
@@ -869,8 +871,6 @@
 
 	len += VBLK_SIZE_COMP;
-	if (len != BE32 (buffer + 0x14)) {
-		printk ("len (COMP): calc = 0x%02x, read = 0x%02x\n", len, BE32 (buffer + 0x14));
+	if (len != BE32 (buffer + 0x14))
 		return FALSE;
-	}
 
 	comp = &vb->vblk.comp;
@@ -919,8 +919,6 @@
 
 	len += VBLK_SIZE_DGR1;
-	if (len != BE32 (buffer + 0x14)) {
-		printk ("len (DGR1): calc = 0x%02x, read = 0x%02x\n", len, BE32 (buffer + 0x14));
+	if (len != BE32 (buffer + 0x14))
 		return FALSE;
-	}
 
 	dgrp = &vb->vblk.dgrp;
@@ -965,8 +963,6 @@
 
 	len += VBLK_SIZE_DGR2;
-	if (len != BE32 (buffer + 0x14)) {
-		printk ("len (DGR2): calc = 0x%02x, read = 0x%02x\n", len, BE32 (buffer + 0x14));
+	if (len != BE32 (buffer + 0x14))
 		return FALSE;
-	}
 
 	dgrp = &vb->vblk.dgrp;
@@ -1003,8 +999,6 @@
 
 	len += VBLK_SIZE_DSK1;
-	if (len != BE32 (buffer + 0x14)) {
-		printk ("len (DSK1): calc = 0x%02x, read = 0x%02x\n", len, BE32 (buffer + 0x14));
+	if (len != BE32 (buffer + 0x14))
 		return FALSE;
-	}
 
 	disk = &vb->vblk.disk;
@@ -1044,8 +1038,6 @@
 
 	len += VBLK_SIZE_DSK2;
-	if (len != BE32 (buffer + 0x14)) {
-		printk ("len (DSK2): calc = 0x%02x, read = 0x%02x\n", len, BE32 (buffer + 0x14));
+	if (len != BE32 (buffer + 0x14))
 		return FALSE;
-	}
 
 	disk = &vb->vblk.disk;
@@ -1089,8 +1081,6 @@
 
 	len += VBLK_SIZE_PART;
-	if (len != BE32 (buffer + 0x14)) {
-		printk ("len (COMP): calc = 0x%02x, read = 0x%02x\n", len, BE32 (buffer + 0x14));
+	if (len != BE32 (buffer + 0x14))
 		return FALSE;
-	}
 
 	part = &vb->vblk.part;
@@ -1157,8 +1147,6 @@
 
 	len += VBLK_SIZE_VOLU;
-	if (len != BE32 (buffer + 0x14)) {
-		printk ("len (VOLU): calc = 0x%02x, read = 0x%02x (0x%02x)\n", len, BE32 (buffer + 0x14), buffer[0x12]);
+	if (len != BE32 (buffer + 0x14))
 		return FALSE;
-	}
 
 	volu = &vb->vblk.volu;
@@ -1190,10 +1178,12 @@
 static BOOL ldm_parse_vblk_head (const u8 *src, struct vblk_head *vbh)
 {
+	DEBUG_ON (!src || !vbh);
+
 	if (MAGIC_VBLK != BE32 (src))
 		return FALSE;
 
 	vbh->group = BE32 (src + 0x08);
-	vbh->rec   = BE16 (src + 0x0c);
-	vbh->nrec  = BE16 (src + 0x0e);
+	vbh->rec   = BE16 (src + 0x0C);
+	vbh->nrec  = BE16 (src + 0x0E);
 
 	return TRUE;
@@ -1221,6 +1211,10 @@
 	BOOL result = FALSE;
 
-	if (ldm_out_of_range (buffer, buflen, 0x18))
+	DEBUG_ON (!src || !vb);
+
+	if (ldm_out_of_range (buffer, buflen, 0x18)) {
+		// FIXME logging
 		return FALSE;
+	}
 
 	vb->flags  = buffer[0x12];
@@ -1246,10 +1240,10 @@
 	}
 
-	if (!result)
-		ldm_error ("Failed to parse VBLK 0x%llx (type: 0x%02x).\n",
-			vb->obj_id, vb->type);
-	else
+	if (result)
 		ldm_debug ("Parsed VBLK 0x%llx (type: 0x%02x) ok.\n",
 			 (unsigned long long) vb->obj_id, vb->type);
+	else
+		ldm_error ("Failed to parse VBLK 0x%llx (type: 0x%02x).\n",
+			vb->obj_id, vb->type);
 
 	return result;
@@ -1289,5 +1283,5 @@
 		return;
 	case VBLK_PART:
-		/* Sort by partition start sector */
+		/* Sort by partition's start sector */
 		list_for_each(item, &ldb->v_part) {
 			struct vblk *v = list_entry(item, struct vblk, list);
@@ -1308,10 +1302,12 @@
  * @list: List of fragments.
  */
-static inline struct frags* ldm_frag_find(list_t* list, u32 group)
+static inline struct frags *ldm_frag_find(list_t *list, u32 group)
 {
-	list_t* item;
+	list_t *item;
+
+	DEBUG_ON (!list);
 
 	list_for_each(item, list) {
-		struct frags* f = list_entry(item, struct frags, list);
+		struct frags *f = list_entry(item, struct frags, list);
 		if (f->group == group)
 			return f;
@@ -1320,9 +1316,15 @@
 }
 
-static inline void ldm_frag_listfree(list_t* list)
+/**
+ * ldm_frag_listfree - 
+ */
+static inline void ldm_frag_listfree(list_t *list)
 {
 	list_t *item, *tmp;
+
+	DEBUG_ON (!list);
+
 	list_for_each_safe(item, tmp, list)
-		kfree( list_entry(item, struct frags, list) );
+		kfree (list_entry(item, struct frags, list));
 
 	INIT_LIST_HEAD(list);
@@ -1343,32 +1345,33 @@
  *		-1	error.
  */
-static int ldm_frag_add(list_t* list, const struct vblk_head* vbh,
-			const u8* data, int size)
+static int ldm_frag_add(list_t *list, const struct vblk_head *vbh,
+			const u8 *data, int size)
 {
 	BOOL bad = FALSE;
-	struct frags* f;
+	struct frags *f;
+
+	DEBUG_ON (!list || !vbh || !data);
 
 	/* Sanity check vblk header. */
 	if (vbh->nrec > FRAG_MAX || vbh->rec >= vbh->nrec) {
 		ldm_error ("Invalid VBLK header.\n");
-		bad = TRUE;
+		bad = TRUE; // FIXME shouldn't we return?
 	}
 
 	/* Try to find previous entry. */
-	if ((f = ldm_frag_find(list, vbh->group) )) {
+	if ((f = ldm_frag_find(list, vbh->group))) {
 		/* More sanity checking. */
-		if (FRAG_GETBAD(f))
+		if (FRAG_GETBAD(f)) {
 			bad = TRUE;
-		else if (vbh->nrec != f->nrec || FRAG_GETMAP(f, vbh->rec)) {
+			// FIXME has this been logged already?
+		} else if (vbh->nrec != f->nrec || FRAG_GETMAP(f, vbh->rec)) {
 			ldm_error ("Inconsistent VBLK fragments!\n");
 			bad = TRUE;
 		}
-	}
-	/* Not found, create a new entry in list. */
-	else {
+	} else { /* Not found, create a new entry in list. */
 		const int nrec = (bad) ? 0 : vbh->nrec;
 
 		/* Allocate memory */
-		f = kmalloc(sizeof (struct frags) + nrec * size, GFP_KERNEL);
+		f = kmalloc(sizeof (*f) + nrec * size, GFP_KERNEL);
 		if (!f) {
 			ldm_crit ("Out of memory.\n");
@@ -1388,5 +1391,4 @@
 	if (bad)
 		FRAG_SETBAD(f);
-
 	/* Copy data */
 	else {
@@ -1395,5 +1397,5 @@
 	}
 
-	return bad;
+	return !bad;
 }
 
@@ -1409,12 +1411,14 @@
  *		FALSE
  */
-static BOOL ldm_frag_commit(list_t* list, int size, struct ldmdb* ldb)
+static BOOL ldm_frag_commit(list_t *list, int size, struct ldmdb *ldb)
 {
 	list_t *item, *tmp;
-	struct vblk* vb = 0;
+	struct vblk *vb = NULL;
 	BOOL result;
 
+	DEBUG_ON (!list || !ldb);
+
 	list_for_each_safe(item, tmp, list) {
-		struct frags* f = list_entry(item, struct frags, list);
+		struct frags *f = list_entry(item, struct frags, list);
 		int i;
 
@@ -1432,5 +1436,5 @@
 		/* Allocate memory for VBLK if necessary. */
 		if (!vb)
-			vb = kmalloc (sizeof(struct vblk), GFP_KERNEL);
+			vb = kmalloc (sizeof(*vb), GFP_KERNEL);
 		if (!vb) {
 			ldm_crit ("Out of memory.\n");
@@ -1442,5 +1446,5 @@
 		if (ldm_parse_vblk (f->data, size * f->nrec, vb)) {
 			ldm_ldmdb_add(vb, ldb);
-			vb = 0;
+			vb = NULL;
 		}
 		/* else - Already logged */
@@ -1450,8 +1454,6 @@
 	}
 	result = TRUE;
-
 out:
-	if (vb)
-		kfree (vb);
+	kfree (vb);
 
 	return result;
@@ -1479,6 +1481,6 @@
 	const int body_size = ldb->vm.vblk_size - 0x10;
 	LIST_HEAD(fraglist);
-	struct vblk *vb = 0;
-	u8 *data = 0;
+	struct vblk *vb = NULL;
+	u8 *data = NULL;
 	Sector sect;
 	int s;
@@ -1489,6 +1491,5 @@
 	/* FIXME what about overrun x%y!=0, can it actually happen? */
 	/* Loop through sectors */
-	for (s = skip; s < finish; s++)
-	{
+	for (s = skip; s < finish; s++) {
 		int i;
 		if (data)
@@ -1506,10 +1507,10 @@
 			struct vblk_head vbh;
 
-			if (!ldm_parse_vblk_head (block, &vbh) ) {
+			if (!ldm_parse_vblk_head (block, &vbh)) {
 				ldm_error ("not a VBLK\n");
 				goto out;
 			}
 
-			if (vbh.nrec == 0)
+			if (vbh.nrec == 0)	/* Not in use */
 				continue;
 
@@ -1523,5 +1524,5 @@
 			/* Allocate memory for vblk */
 			if (!vb)
-				vb = kmalloc (sizeof(struct vblk), GFP_KERNEL);
+				vb = kmalloc (sizeof(*vb), GFP_KERNEL);
 			if (!vb) {
 				ldm_crit ("Out of memory in get vblks.\n");
@@ -1532,5 +1533,5 @@
 			if (ldm_parse_vblk (body_data, body_size, vb)) {
 				ldm_ldmdb_add(vb, ldb);
-				vb = 0;
+				vb = NULL;
 			}
 			/* else - Already logged */
@@ -1540,8 +1541,6 @@
 	/* Combine fragments. */
 	result = ldm_frag_commit(&fraglist, body_size, ldb);
-
 out:
-	if (vb)
-		kfree(vb);
+	kfree(vb);
 	if (data)
 		put_dev_sector(sect);
@@ -1588,4 +1587,5 @@
 {
 	list_t *item, *tmp;
+
 	DEBUG_ON (!lh);
 
@@ -1596,4 +1596,5 @@
 }
 
+
 /**
  * ldm_partition - Find out whether a device is a dynamic disk and handle it
@@ -1650,5 +1651,4 @@
 	    	goto out;
 
-	// FIXME: Why do we wan't this partition ??
 	/* Create the LDM database device. */
 	if (!ldm_create_partition (hd, first_minor++, base, ldb->ph.config_size))
@@ -1693,2 +1693,3 @@
 	return err;
 }
+

Index: ldm.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -U2 -r1.37 -r1.38
--- ldm.h	9 Mar 2002 01:58:42 -0000	1.37
+++ ldm.h	12 Mar 2002 05:35:53 -0000	1.38
@@ -115,12 +115,4 @@
 /* Borrowed from msdos.c. */
 #define SYS_IND(p)		(get_unaligned(&p->sys_ind))
-#define NR_SECTS(p)		({ __typeof__(p->nr_sects) __a =	\
-					get_unaligned(&p->nr_sects);	\
-					le32_to_cpu(__a);		\
-				})
-#define START_SECT(p)		({ __typeof__(p->start_sect) __a =	\
-					get_unaligned(&p->start_sect);	\
-					le32_to_cpu(__a);		\
-				})
 
 /* VBLK Fragment handling */
@@ -140,8 +132,6 @@
 };
 
-
 /* In memory LDM database structures. */
 
-#define DISK_ID_SIZE		64	/* Size in bytes. */
 #define GUID_SIZE		16
 

[Linux-NTFS-cvs] CVS: linux-ntfs ChangeLog,1.26,1.27

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

Changes by: antona

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

Modified Files:
	ChangeLog 
Log Message:
Fix typo in mkntfs usage information.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -U2 -r1.26 -r1.27
--- ChangeLog	1 Feb 2002 02:46:16 -0000	1.26
+++ ChangeLog	12 Mar 2002 00:34:35 -0000	1.27
@@ -1,2 +1,6 @@
+12/03/2002 - Fix typo in usage.
+	Fix typo in usage information of mkntfs. Thanks to Richard Russon for
+	spotting it.
+
 01/02/2002 - Attempt to fix compile warnings on powerpc.
 	Attempt to fix compile warnings on powerpc. It seems powerpc uses

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

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

Changes by: antona

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

Modified Files:
	mkntfs.c 
Log Message:
Fix typo in mkntfs usage information.


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -U2 -r1.56 -r1.57
--- mkntfs.c	1 Feb 2002 02:46:16 -0000	1.56
+++ mkntfs.c	12 Mar 2002 00:34:35 -0000	1.57
@@ -2510,5 +2510,5 @@
 		"directory.\nUsage: %s [-s sector-size] [-c cluster-size] "
 			"[-L volume-label]\n\t[-z mft-zone-multiplier] "
-			"[-fnqvvFQV] device [numer-of-sectors]\n",
+			"[-fnqvvFQV] device [number-of-sectors]\n",
 		EXEC_NAME, EXEC_NAME, EXEC_NAME);
 	exit(1);

[Linux-NTFS-cvs] CVS: dynamic-disk ChangeLog,1.13,1.14

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk
In directory usw-pr-cvs1:/tmp/cvs-serv7364

Modified Files:
	ChangeLog 
Log Message:
missed out an entry


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- ChangeLog	9 Mar 2002 01:58:42 -0000	1.13
+++ ChangeLog	9 Mar 2002 02:11:39 -0000	1.14
@@ -1,3 +1,3 @@
-2002-03-09	Richard Russon <ld...@fl...>
+2002-03-09 Richard Russon <ld...@fl...>
 
 	* I've finally managed to decipher all the flags and I now
@@ -6,5 +6,6 @@
 	* Removed some redundant checks of VBLKs.
 
-2002-02-24	Jakob Kemi <jak...@te...>
+2002-02-24 Jakob Kemi <jak...@te...>
+
 	* Total redesign of multipart VBLK record handling.
 	  Should be faster and cleaner now. It still needs some polishing.
@@ -12,5 +13,10 @@
 	* Probably introduced some new bugs ;)
 
-2002-02-09 	Jakob Kemi <jak...@te...>
+2002-02-23 Richard Russon <ld...@fl...>
+
+	* Replace hex conversion routines with a sscanf
+	* Remove lots of assumptions from ldminfo's copy option
+
+2002-02-09  Jakob Kemi <jak...@te...>
 
 	* Code cleanups and commenting
@@ -22,5 +28,5 @@
 	* Converted tab length in ldm_md.c from 4 to 8
 
-2001-02-08 	Richard Russon <ld...@fl...>
+2001-02-08  Richard Russon <ld...@fl...>
 
 	* Build fixes.  It should now compile cleanly against late 2.4 and 2.5,
@@ -28,10 +34,10 @@
 	* Tidied code, BUG_ON, list_t, BOOL, __attribute__ printf
 
-2001-12-31 	Richard Russon <ld...@fl...>
+2001-12-31  Richard Russon <ld...@fl...>
 
 	* Version 0.0.5 released
 	* ldminfo works properly again
 
-2001-12-19 	Richard Russon <ld...@fl...>
+2001-12-19  Richard Russon <ld...@fl...>
 
 	* Made ldminfo compile again
@@ -39,5 +45,5 @@
 	* Minor bugfix for extended VBLKs
 
-2001-12-14	Jakob Kemi <jak...@te...>
+2001-12-14 Jakob Kemi <jak...@te...>
 
 	* LDM MD volumes now check for valid GUID.
@@ -46,5 +52,5 @@
 	* Updated changelog for the last month ;)
 
-2001-11-24	Jakob Kemi <jak...@te...>
+2001-11-24 Jakob Kemi <jak...@te...>
 
 	* Further rewrite
@@ -57,5 +63,5 @@
 	* More tidying.
 
-2001-11-20	Jakob Kemi <jak...@te...>
+2001-11-20 Jakob Kemi <jak...@te...>
 
 	* Big rewrite
@@ -67,15 +73,15 @@
 	* Lots of tidying.
 
-2001-11-13	Jakob Kemi <jak...@te...>
+2001-11-13 Jakob Kemi <jak...@te...>
 
 	* Added support for native LDM stripe(RAID-0) volumes. (ldm_md.c)
 	  (config option CONFIG_LDM_MD)
 
-2001-10-09	Jakob Kemi <jak...@te...>
+2001-10-09 Jakob Kemi <jak...@te...>
 
 	* Misc. fixes, support for partition types
 	* Added md autodetect
 
-2001-08-22	Richard Russon <ld...@fl...>
+2001-08-22 Richard Russon <ld...@fl...>
 
 	* Huge rewrite -- database now cached
@@ -83,5 +89,5 @@
 	* Comment blocks everywhere
 
-2000-07-26	Richard Russon <ld...@fl...>
+2000-07-26 Richard Russon <ld...@fl...>
 
 	* Version 0.0.4 released
@@ -89,5 +95,5 @@
 	* Merged prototype ldm and drive into ldminfo
 
-2000-07-03	Richard Russon <ld...@fl...>
+2000-07-03 Richard Russon <ld...@fl...>
 
 	* Version 0.0.3 released
@@ -96,5 +102,5 @@
 	* Debug logging is now a config option
 
-2000-06-26	Richard Russon <ld...@fl...>
+2000-06-26 Richard Russon <ld...@fl...>
 
 	* Version 0.0.2	released
@@ -103,5 +109,5 @@
 	* Added LOTS of logging
 
-2000-06-22	Richard Russon <ld...@fl...>
+2000-06-22 Richard Russon <ld...@fl...>
 
 	* Version 0.0.1	released

[Linux-NTFS-cvs] CVS: dynamic-disk/linux/fs/partitions ldm.c,1.63,1.64 ldm.h,1.36,1.37

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv4849/linux/fs/partitions

Modified Files:
	ldm.c ldm.h 
Log Message:
figured out all of the vblk flags.  now I'm certain of what to expect.
also, now check the vblk's length.


Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -U2 -r1.63 -r1.64
--- ldm.c	27 Feb 2002 17:40:20 -0000	1.63
+++ ldm.c	9 Mar 2002 01:58:42 -0000	1.64
@@ -2,7 +2,7 @@
  * ldm - Support for Windows' Logical Disk Manager (Dynamic Disks)
  *
- * Copyright (C) 2001 Richard Russon <ld...@fl...>
+ * Copyright (C) 2001,2002 Richard Russon <ld...@fl...>
  * Copyright (C) 2001 Anton Altaparmakov <an...@us...>
- * Copyright (C) 2001 Jakob Kemi <jak...@te...>
+ * Copyright (C) 2001,2002 Jakob Kemi <jak...@te...>
  *
  * Documentation is available at http://linux-ntfs.sf.net/ldm
@@ -172,4 +172,5 @@
 */
 
+
 /**
  * ldm_parse_privhead - Read the LDM Database PRIVHEAD structure
@@ -396,5 +397,5 @@
 
 	if (*(u16*) (data + 0x01FE) != cpu_to_le16 (MSDOS_LABEL_MAGIC)) {
-		ldm_debug ("No MS-DOS partition-table found.\n");
+		ldm_debug ("No MS-DOS partition table found.\n");
 		goto out;
 	}
@@ -410,5 +411,5 @@
 		ldm_debug ("Parsed partition table successfully.\n");
 	else
-		ldm_debug ("Found an MS-DOS partition-table, not a dynamic disk.\n");
+		ldm_debug ("Found an MS-DOS partition table, not a dynamic disk.\n");
 out:
 	put_dev_sector(sect);
@@ -830,4 +831,5 @@
 }
 
+
 /**
  * ldm_parse_comp - Read a raw VBLK Component object into a vblk structure
@@ -843,27 +845,40 @@
 static BOOL ldm_parse_comp (const u8 *buffer, int buflen, struct vblk *vb)
 {
-	int rel_objid, rel_name, rel_vstate, rel_parent;
+	int r_objid, r_name, r_vstate, r_child, r_parent, r_stripe, r_cols, len;
 	struct vblk_comp *comp;
 
 	DEBUG_ON (!buffer || !vb);
 
-	rel_objid  = ldm_relative (buffer, buflen, 0x18, 0);
-	rel_name   = ldm_relative (buffer, buflen, 0x18, rel_objid);
-	rel_vstate = ldm_relative (buffer, buflen, 0x18, rel_name);
-	rel_parent = ldm_relative (buffer, buflen, 0x18, rel_vstate);
-	if (rel_parent < 0)
+	r_objid  = ldm_relative (buffer, buflen, 0x18, 0);
+	r_name   = ldm_relative (buffer, buflen, 0x18, r_objid);
+	r_vstate = ldm_relative (buffer, buflen, 0x18, r_name);
+	r_child  = ldm_relative (buffer, buflen, 0x1D, r_vstate);
+	r_parent = ldm_relative (buffer, buflen, 0x2D, r_child);
+
+	if (buffer[0x12] & VBLK_FLAG_COMP_STRIPE) {
+		r_stripe = ldm_relative (buffer, buflen, 0x2E, r_parent);
+		r_cols   = ldm_relative (buffer, buflen, 0x2E, r_stripe);
+		len = r_cols;
+	} else {
+		r_stripe = 0;
+		r_cols   = 0;
+		len = r_parent;
+	}
+	if (len < 0)
 		return FALSE;
 
-	/* Volume State, Parent Id */
-	if (ldm_out_of_range (buffer, buflen, 0x18 + rel_name) ||
-	    ldm_out_of_range (buffer, buflen, 0x2F + rel_vstate))
+	len += VBLK_SIZE_COMP;
+	if (len != BE32 (buffer + 0x14)) {
+		printk ("len (COMP): calc = 0x%02x, read = 0x%02x\n", len, BE32 (buffer + 0x14));
 		return FALSE;
+	}
 
 	comp = &vb->vblk.comp;
-	comp->type  = buffer[0x18 + rel_vstate];
-	comp->parts = buffer[0x1E + rel_vstate];
-	comp->parent_id = ldm_get_vnum (buffer + 0x2F + rel_vstate);
-	ldm_get_vstr (buffer + 0x18 + rel_name, comp->state,
+	comp->type  = buffer[0x18 + r_vstate];
+	comp->parts = ldm_get_vnum (buffer + 0x1D + r_vstate);
+	comp->parent_id = ldm_get_vnum (buffer + 0x2F + r_vstate);
+	ldm_get_vstr (buffer + 0x18 + r_name, comp->state,
 		sizeof (comp->state));
+
 	return TRUE;
 }
@@ -882,21 +897,33 @@
 static int ldm_parse_dgrp (const u8 *buffer, int buflen, struct vblk *vb)
 {
-	int rel_objid, rel_name, rel_diskid;
+	int r_objid, r_name, r_diskid, r_id1, r_id2, len;
 	struct vblk_dgrp *dgrp;
 
 	DEBUG_ON (!buffer || !vb);
 
-	rel_objid  = ldm_relative (buffer, buflen, 0x18, 0);
-	rel_name   = ldm_relative (buffer, buflen, 0x18, rel_objid);
-	rel_diskid = ldm_relative (buffer, buflen, 0x18, rel_name);
-	if (rel_diskid < 0)
+	r_objid  = ldm_relative (buffer, buflen, 0x18, 0);
+	r_name   = ldm_relative (buffer, buflen, 0x18, r_objid);
+	r_diskid = ldm_relative (buffer, buflen, 0x18, r_name);
+
+	if (buffer[0x12] & VBLK_FLAG_DGR1_IDS) {
+		r_id1 = ldm_relative (buffer, buflen, 0x24, r_diskid);
+		r_id2 = ldm_relative (buffer, buflen, 0x24, r_id1);
+		len = r_id2;
+	} else {
+		r_id1 = 0;
+		r_id2 = 0;
+		len = r_diskid;
+	}
+	if (len < 0)
 		return FALSE;
 
-	/* Disk Id */
-	if (ldm_out_of_range (buffer, buflen, 0x18 + rel_objid))
+	len += VBLK_SIZE_DGR1;
+	if (len != BE32 (buffer + 0x14)) {
+		printk ("len (DGR1): calc = 0x%02x, read = 0x%02x\n", len, BE32 (buffer + 0x14));
 		return FALSE;
+	}
 
 	dgrp = &vb->vblk.dgrp;
-	ldm_get_vstr (buffer + 0x18 + rel_name, dgrp->disk_id,
+	ldm_get_vstr (buffer + 0x18 + r_name, dgrp->disk_id,
 		sizeof (dgrp->disk_id));
 	return TRUE;
@@ -917,23 +944,33 @@
 {
 	char buf[64];
-	int rel_objid, rel_name, rel_diskid;
+	int r_objid, r_name, r_id1, r_id2, len;
 	struct vblk_dgrp *dgrp;
 
 	DEBUG_ON (!buffer || !vb);
 
-	rel_objid  = ldm_relative (buffer, buflen, 0x18, 0);
-	rel_name   = ldm_relative (buffer, buflen, 0x18, rel_objid);
-	rel_diskid = ldm_relative (buffer, buflen, 0x44, rel_name);
-	if (rel_diskid < 0)
+	r_objid  = ldm_relative (buffer, buflen, 0x18, 0);
+	r_name   = ldm_relative (buffer, buflen, 0x18, r_objid);
+
+	if (buffer[0x12] & VBLK_FLAG_DGR2_IDS) {
+		r_id1 = ldm_relative (buffer, buflen, 0x44, r_name);
+		r_id2 = ldm_relative (buffer, buflen, 0x44, r_id1);
+		len = r_id2;
+	} else {
+		r_id1 = 0;
+		r_id2 = 0;
+		len = r_name;
+	}
+	if (len < 0)
 		return FALSE;
 
-	/* Name, Disk Id 1 */
-	if (ldm_out_of_range (buffer, buflen, 0x18 + rel_objid) ||
-	    ldm_out_of_range (buffer, buflen, 0x44 + rel_name))
+	len += VBLK_SIZE_DGR2;
+	if (len != BE32 (buffer + 0x14)) {
+		printk ("len (DGR2): calc = 0x%02x, read = 0x%02x\n", len, BE32 (buffer + 0x14));
 		return FALSE;
+	}
 
 	dgrp = &vb->vblk.dgrp;
 
-	ldm_get_vstr (buffer + 0x18 + rel_objid, buf, sizeof (buf));
+	ldm_get_vstr (buffer + 0x18 + r_objid, buf, sizeof (buf));
 	return TRUE;
 }
@@ -952,24 +989,27 @@
 static BOOL ldm_parse_disk (const u8 *buffer, int buflen, struct vblk *vb)
 {
-	int rel_objid, rel_name, rel_diskid;
+	int r_objid, r_name, r_diskid, r_altname, len;
 	struct vblk_disk *disk;
 
 	DEBUG_ON (!buffer || !vb);
 
-	rel_objid  = ldm_relative (buffer, buflen, 0x18, 0);
-	rel_name   = ldm_relative (buffer, buflen, 0x18, rel_objid);
-	rel_diskid = ldm_relative (buffer, buflen, 0x18, rel_name);
-	if (rel_diskid < 0)
+	r_objid   = ldm_relative (buffer, buflen, 0x18, 0);
+	r_name    = ldm_relative (buffer, buflen, 0x18, r_objid);
+	r_diskid  = ldm_relative (buffer, buflen, 0x18, r_name);
+	r_altname = ldm_relative (buffer, buflen, 0x18, r_diskid);
+	len = r_altname;
+	if (len < 0)
 		return FALSE;
 
-	/* Disk Id, Alt Name */
-	if (ldm_out_of_range (buffer, buflen, 0x18 + rel_name) ||
-	    ldm_out_of_range (buffer, buflen, 0x18 + rel_diskid))
+	len += VBLK_SIZE_DSK1;
+	if (len != BE32 (buffer + 0x14)) {
+		printk ("len (DSK1): calc = 0x%02x, read = 0x%02x\n", len, BE32 (buffer + 0x14));
 		return FALSE;
+	}
 
 	disk = &vb->vblk.disk;
-	ldm_get_vstr (buffer + 0x18 + rel_diskid, disk->alt_name,
+	ldm_get_vstr (buffer + 0x18 + r_diskid, disk->alt_name,
 		sizeof (disk->alt_name));
-	if (!ldm_parse_guid (buffer + 0x19 + rel_name, disk->disk_id)) {
+	if (!ldm_parse_guid (buffer + 0x19 + r_name, disk->disk_id)) {
 		ldm_error ("VBLK DISK contains an invalid GUID.\n");
 		return FALSE;
@@ -992,16 +1032,23 @@
 static BOOL ldm_parse_disk2 (const u8 *buffer, int buflen, struct vblk *vb)
 {
-	int rel_objid, rel_name;
+	int r_objid, r_name, len;
 	struct vblk_disk *disk;
 
 	DEBUG_ON (!buffer || !vb);
 
-	rel_objid  = ldm_relative (buffer, buflen, 0x18, 0);
-	rel_name   = ldm_relative (buffer, buflen, 0x18, rel_objid);
-	if (rel_objid < 0)
+	r_objid  = ldm_relative (buffer, buflen, 0x18, 0);
+	r_name   = ldm_relative (buffer, buflen, 0x18, r_objid);
+	len = r_name;
+	if (len < 0)
 		return FALSE;
 
+	len += VBLK_SIZE_DSK2;
+	if (len != BE32 (buffer + 0x14)) {
+		printk ("len (DSK2): calc = 0x%02x, read = 0x%02x\n", len, BE32 (buffer + 0x14));
+		return FALSE;
+	}
+
 	disk = &vb->vblk.disk;
-	memcpy (disk->disk_id, buffer + 0x18 + rel_name, GUID_SIZE);
+	memcpy (disk->disk_id, buffer + 0x18 + r_name, GUID_SIZE);
 	return TRUE;
 }
@@ -1020,32 +1067,39 @@
 static BOOL ldm_parse_part (const u8 *buffer, int buflen, struct vblk *vb)
 {
-	int rel_objid, rel_name, rel_size, rel_parent, rel_diskid;
+	int r_objid, r_name, r_size, r_parent, r_diskid, r_index, len;
 	struct vblk_part *part;
 
 	DEBUG_ON (!buffer || !vb);
 
-	rel_objid  = ldm_relative (buffer, buflen, 0x18, 0);
-	rel_name   = ldm_relative (buffer, buflen, 0x18, rel_objid);
-	rel_size   = ldm_relative (buffer, buflen, 0x34, rel_name);
-	rel_parent = ldm_relative (buffer, buflen, 0x34, rel_size);
-	rel_diskid = ldm_relative (buffer, buflen, 0x34, rel_parent);
-	if (rel_parent < 0)
+	r_objid  = ldm_relative (buffer, buflen, 0x18, 0);
+	r_name   = ldm_relative (buffer, buflen, 0x18, r_objid);
+	r_size   = ldm_relative (buffer, buflen, 0x34, r_name);
+	r_parent = ldm_relative (buffer, buflen, 0x34, r_size);
+	r_diskid = ldm_relative (buffer, buflen, 0x34, r_parent);
+
+	if (buffer[0x12] & VBLK_FLAG_PART_INDEX) {
+		r_index = ldm_relative (buffer, buflen, 0x34, r_diskid);
+		len = r_index;
+	} else {
+		r_index = 0;
+		len = r_diskid;
+	}
+	if (len < 0)
 		return FALSE;
 
-	/* Size, Parent Id, Disk Id */
-	if (ldm_out_of_range (buffer, buflen, 0x34 + rel_name) ||
-	    ldm_out_of_range (buffer, buflen, 0x34 + rel_size) ||
-	    ldm_out_of_range (buffer, buflen, 0x34 + rel_parent)||
-	    ldm_out_of_range (buffer, buflen, 0x34 + rel_diskid))
+	len += VBLK_SIZE_PART;
+	if (len != BE32 (buffer + 0x14)) {
+		printk ("len (COMP): calc = 0x%02x, read = 0x%02x\n", len, BE32 (buffer + 0x14));
 		return FALSE;
+	}
 
 	part = &vb->vblk.part;
-	part->start         = BE64         (buffer + 0x24 + rel_name);
-	part->volume_offset = BE64         (buffer + 0x2C + rel_name);
-	part->size          = ldm_get_vnum (buffer + 0x34 + rel_name);
-	part->parent_id     = ldm_get_vnum (buffer + 0x34 + rel_size);
-	part->disk_id       = ldm_get_vnum (buffer + 0x34 + rel_parent);
+	part->start         = BE64         (buffer + 0x24 + r_name);
+	part->volume_offset = BE64         (buffer + 0x2C + r_name);
+	part->size          = ldm_get_vnum (buffer + 0x34 + r_name);
+	part->parent_id     = ldm_get_vnum (buffer + 0x34 + r_size);
+	part->disk_id       = ldm_get_vnum (buffer + 0x34 + r_parent);
 	if (vb->flags & VBLK_FLAG_SUCCESSIVE)
-		part->partnum = buffer[0x35 + rel_diskid];
+		part->partnum = buffer[0x35 + r_diskid];
 	else
 		part->partnum = 0;
@@ -1067,37 +1121,57 @@
 static BOOL ldm_parse_volu (const u8 *buffer, int buflen, struct vblk *vb)
 {
-	int rel_objid, rel_name, rel_vtype, rel_size, rel_drive;
+	int r_objid, r_name, r_vtype, r_child, r_size, r_id1, r_id2, r_size2, r_drive, len;
 	struct vblk_volu *volu;
 
 	DEBUG_ON (!buffer || !vb);
 
-	rel_objid  = ldm_relative (buffer, buflen, 0x18, 0);
-	rel_name   = ldm_relative (buffer, buflen, 0x18, rel_objid);
-	rel_vtype  = ldm_relative (buffer, buflen, 0x18, rel_name);
-	rel_size   = ldm_relative (buffer, buflen, 0x40, rel_vtype);
-	rel_drive  = ldm_relative (buffer, buflen, 0x55, rel_size);
-	if (rel_drive < 0)
+	r_objid  = ldm_relative (buffer, buflen, 0x18, 0);
+	r_name   = ldm_relative (buffer, buflen, 0x18, r_objid);
+	r_vtype  = ldm_relative (buffer, buflen, 0x18, r_name);
+	r_child  = ldm_relative (buffer, buflen, 0x2E, r_vtype);
+	r_size   = ldm_relative (buffer, buflen, 0x3E, r_child);
+
+	if (buffer[0x12] & VBLK_FLAG_VOLU_ID1)
+		r_id1 = ldm_relative (buffer, buflen, 0x53, r_size);
+	else
+		r_id1 = r_size;
+
+	if (buffer[0x12] & VBLK_FLAG_VOLU_ID2)
+		r_id2 = ldm_relative (buffer, buflen, 0x53, r_id1);
+	else
+		r_id2 = r_id1;
+
+	if (buffer[0x12] & VBLK_FLAG_VOLU_SIZE)
+		r_size2 = ldm_relative (buffer, buflen, 0x53, r_id2);
+	else
+		r_size2 = r_id2;
+
+	if (buffer[0x12] & VBLK_FLAG_VOLU_DRIVE)
+		r_drive = ldm_relative (buffer, buflen, 0x53, r_size2);
+	else
+		r_drive = r_size2;
+
+	len = r_drive;
+	if (len < 0)
 		return FALSE;
 
-	/* Volume Type, Drive Hint, Size */
-	if (ldm_out_of_range (buffer, buflen, 0x18 + rel_name) ||
-	    ldm_out_of_range (buffer, buflen, 0x55 + rel_size) ||
-	    ldm_out_of_range (buffer, buflen, 0x40 + rel_vtype))
+	len += VBLK_SIZE_VOLU;
+	if (len != BE32 (buffer + 0x14)) {
+		printk ("len (VOLU): calc = 0x%02x, read = 0x%02x (0x%02x)\n", len, BE32 (buffer + 0x14), buffer[0x12]);
 		return FALSE;
+	}
 
 	volu = &vb->vblk.volu;
-	volu->partition_type = buffer[0x44 + rel_size];
-	volu->size = ldm_get_vnum (buffer + 0x40 + rel_vtype);
-	memcpy (volu->volume_state, buffer + 0x19 + rel_vtype,
+	volu->partition_type = buffer[0x42 + r_size];
+	volu->size = ldm_get_vnum (buffer + 0x3E + r_child);
+	memcpy (volu->volume_state, buffer + 0x19 + r_vtype,
 		sizeof (volu->volume_state));
-	memcpy (volu->guid, buffer + 0x45 + rel_size,  sizeof (volu->guid));
-	ldm_get_vstr (buffer + 0x18 + rel_name,  volu->volume_type,
+	memcpy (volu->guid, buffer + 0x43 + r_size,  sizeof (volu->guid));
+	ldm_get_vstr (buffer + 0x18 + r_name,  volu->volume_type,
 		sizeof (volu->volume_type));
-	ldm_get_vstr (buffer + 0x55 + rel_size,  volu->drive_hint,
-		sizeof (volu->drive_hint));
-	/* FIXME There's an extra Id in here occasionally */
-	if ((volu->drive_hint[0] < 'A') || (volu->drive_hint[0] > 'Z'))
-		ldm_get_vstr (buffer + 0x55 + rel_drive,  volu->drive_hint,
+	if (buffer[0x12] & VBLK_FLAG_VOLU_DRIVE) {
+		ldm_get_vstr (buffer + 0x53 + r_size,  volu->drive_hint,
 			sizeof (volu->drive_hint));
+	}
 	return TRUE;
 }

Index: ldm.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -U2 -r1.36 -r1.37
--- ldm.h	27 Feb 2002 15:56:10 -0000	1.36
+++ ldm.h	9 Mar 2002 01:58:42 -0000	1.37
@@ -5,7 +5,7 @@
  * ldm - Part of the Linux-NTFS project.
  *
- * Copyright (C) 2001 Richard Russon <ld...@fl...>
+ * Copyright (C) 2001,2002 Richard Russon <ld...@fl...>
  * Copyright (C) 2001 Anton Altaparmakov <an...@us...>
- * Copyright (C) 2001 Jakob Kemi <jak...@te...>
+ * Copyright (C) 2001,2002 Jakob Kemi <jak...@te...>
  *
  * Documentation is available at http://linux-ntfs.sf.net/ldm
@@ -59,4 +59,23 @@
 #define VBLK_FLAG_COMPOUND	0x10		/* 00010000 Compound comp. */
 #define VBLK_FLAG_SUCCESSIVE	0x08		/* 00001000 n-th in set, n>1 */
+
+/* vblk flags indicating extra information will be present */
+#define	VBLK_FLAG_COMP_STRIPE	0x10
+#define	VBLK_FLAG_PART_INDEX	0x08
+#define	VBLK_FLAG_DGR1_IDS	0x08
+#define	VBLK_FLAG_DGR2_IDS	0x08
+#define	VBLK_FLAG_VOLU_ID1	0x08
+#define	VBLK_FLAG_VOLU_ID2	0x20
+#define	VBLK_FLAG_VOLU_SIZE	0x80
+#define	VBLK_FLAG_VOLU_DRIVE	0x02
+
+/* size of a vblk's static parts */
+#define VBLK_SIZE_COMP		22
+#define VBLK_SIZE_PART		28
+#define VBLK_SIZE_DSK1		12
+#define VBLK_SIZE_DSK2		45
+#define VBLK_SIZE_DGR1		12
+#define VBLK_SIZE_DGR2		44
+#define VBLK_SIZE_VOLU		59
 
 /* component types */

[Linux-NTFS-cvs] CVS: dynamic-disk ChangeLog,1.12,1.13 Makefile,1.11,1.12

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk
In directory usw-pr-cvs1:/tmp/cvs-serv4849

Modified Files:
	ChangeLog Makefile 
Log Message:
figured out all of the vblk flags.  now I'm certain of what to expect.
also, now check the vblk's length.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- ChangeLog	24 Feb 2002 21:21:23 -0000	1.12
+++ ChangeLog	9 Mar 2002 01:58:42 -0000	1.13
@@ -1,2 +1,9 @@
+2002-03-09	Richard Russon <ld...@fl...>
+
+	* I've finally managed to decipher all the flags and I now
+	  understand the VBLK numbering.
+	* Added checks for the lengths of VBLKs.
+	* Removed some redundant checks of VBLKs.
+
 2002-02-24	Jakob Kemi <jak...@te...>
 	* Total redesign of multipart VBLK record handling.

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- Makefile	23 Feb 2002 16:38:51 -0000	1.11
+++ Makefile	9 Mar 2002 01:58:42 -0000	1.12
@@ -59,5 +59,5 @@
 	$(RM) $(LINKS)
 	find . -name tags -exec $(RM) {} \;
-	find . -name \*.data \*.part -exec $(RM) {} \;
+	find . -name \*.data -o -name \*.part -exec $(RM) {} \;
 
 docs:

[Linux-NTFS-cvs] CVS: ntfs-driver-tng/linux/fs/ntfs aops.c,1.55,1.56 attrib.c,1.69,1.70 attrib.h,1.17,1.18 compress.c,1.34,1.35 dir.c,1.48,1.49 inode.c,1.72,1.73 mft.c,1.51,1.52 super.c,1.81,1.82 types.h,1.5,1.6

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

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv26232/linux/fs/ntfs

Modified Files:
	aops.c attrib.c attrib.h compress.c dir.c inode.c mft.c 
	super.c types.h 
Log Message:
Replace run list spinlock with a semaphore.


Index: aops.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/aops.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -U2 -r1.55 -r1.56
--- aops.c	4 Mar 2002 22:56:14 -0000	1.55
+++ aops.c	6 Mar 2002 16:01:26 -0000	1.56
@@ -101,7 +101,7 @@
 
 	/* Convert the vcn to the corresponding logical cluster number (lcn). */
-	read_lock(&ni->run_list.lock);
+	down_read(&ni->run_list.lock);
 	lcn = vcn_to_lcn(ni->run_list.rl, vcn);
-	read_unlock(&ni->run_list.lock);
+	up_read(&ni->run_list.lock);
 	/* Successful remap. */
 	if (lcn >= 0) {
@@ -298,7 +298,7 @@
 		return 0;
 	}
-	read_lock(&vol->mftbmp_rl.lock);
+	down_read(&vol->mftbmp_rl.lock);
 	lcn = vcn_to_lcn(vol->mftbmp_rl.rl, vcn);
-	read_unlock(&vol->mftbmp_rl.lock);
+	up_read(&vol->mftbmp_rl.lock);
 	ntfs_debug("lcn = 0x%Lx.", (long long)lcn);
 	if (lcn < 0LL) {

Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/attrib.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -U2 -r1.69 -r1.70
--- attrib.c	5 Mar 2002 02:35:02 -0000	1.69
+++ attrib.c	6 Mar 2002 16:01:26 -0000	1.70
@@ -832,5 +832,5 @@
 
 	/* Lock the run list. */
-	write_lock(&ni->run_list.lock);
+	down_write(&ni->run_list.lock);
 
 	/* Make sure someone else didn't do the work while we were spinning. */
@@ -850,5 +850,5 @@
 
 	/* Unlock the run list. */
-	write_unlock(&ni->run_list.lock);
+	up_write(&ni->run_list.lock);
 	
 	put_attr_search_ctx(ctx);

Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/attrib.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -U2 -r1.17 -r1.18
--- attrib.h	4 Mar 2002 22:56:14 -0000	1.17
+++ attrib.h	6 Mar 2002 16:01:26 -0000	1.18
@@ -31,4 +31,10 @@
 #include "layout.h"
 
+static inline void init_run_list(run_list *rl)
+{
+	rl->rl = NULL;
+	init_rwsem(&rl->lock);
+}
+
 typedef enum {
 	LCN_HOLE		= -1,	/* Keep this as highest value or die! */

Index: compress.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/compress.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -U2 -r1.34 -r1.35
--- compress.c	4 Mar 2002 22:56:14 -0000	1.34
+++ compress.c	6 Mar 2002 16:01:26 -0000	1.35
@@ -570,7 +570,7 @@
 		}
 		/* Find lcn of vcn and convert it into blocks. */
-		read_lock(&ni->run_list.lock);
+		down_read(&ni->run_list.lock);
 		lcn = vcn_to_lcn(ni->run_list.rl, vcn);
-		read_unlock(&ni->run_list.lock);
+		up_read(&ni->run_list.lock);
 		ntfs_debug("Reading vcn = 0x%Lx, lcn = 0x%Lx.",
 				(long long)vcn, (long long)lcn);

Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/dir.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -U2 -r1.48 -r1.49
--- dir.c	4 Mar 2002 22:56:14 -0000	1.48
+++ dir.c	6 Mar 2002 16:01:26 -0000	1.49
@@ -540,10 +540,8 @@
 	if (filp->f_pos == 1) {
 		ntfs_debug("Calling filldir for .. with len 2, f_pos 0x1, "
-				"inode 0x%Lx, DT_DIR.",
-				(unsigned long long)NTFS_I(
-				filp->f_dentry->d_parent->d_inode)->mft_no);
+				"inode 0x%lx, DT_DIR.",
+				parent_ino(filp->f_dentry));
 		rc = filldir(dirent, "..", 2, filp->f_pos,
-				filp->f_dentry->d_parent->d_inode->i_ino,
-				DT_DIR);
+				parent_ino(filp->f_dentry), DT_DIR);
 		if (rc)
 			goto done;

Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/inode.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -U2 -r1.72 -r1.73
--- inode.c	5 Mar 2002 00:00:04 -0000	1.72
+++ inode.c	6 Mar 2002 16:01:26 -0000	1.73
@@ -78,11 +78,11 @@
 	atomic_set(&ni->count, 1);
 	ni->vol = NULL;
-	INIT_RUN_LIST(&ni->run_list);
+	init_run_list(&ni->run_list);
 	init_rwsem(&ni->mrec_lock);
 	atomic_set(&ni->mft_count, 0);
 	ni->page = NULL;
 	ni->attr_list = NULL;
-	INIT_RUN_LIST(&ni->attr_list_rl);
-	INIT_RUN_LIST(&ni->_IDM(bmp_rl));
+	init_run_list(&ni->attr_list_rl);
+	init_run_list(&ni->_IDM(bmp_rl));
 	init_MUTEX(&ni->extent_lock);
 	ni->_INE(base_ntfs_ino) = NULL;
@@ -1305,15 +1305,15 @@
 	}
 	/* Free all alocated memory. */
-	write_lock(&ni->run_list.lock);
+	down_write(&ni->run_list.lock);
 	ntfs_free(ni->run_list.rl);
 	ni->run_list.rl = NULL;
-	write_unlock(&ni->run_list.lock);
+	up_write(&ni->run_list.lock);
 
 	ntfs_free(ni->attr_list);
 
-	write_lock(&ni->attr_list_rl.lock);
+	down_write(&ni->attr_list_rl.lock);
 	ntfs_free(ni->attr_list_rl.rl);
 	ni->attr_list_rl.rl = NULL;
-	write_unlock(&ni->attr_list_rl.lock);
+	up_write(&ni->attr_list_rl.lock);
 }
 
@@ -1343,7 +1343,7 @@
 
 	if (S_ISDIR(vi->i_mode)) {
-		write_lock(&ni->_IDM(bmp_rl).lock);
+		down_write(&ni->_IDM(bmp_rl).lock);
 		ntfs_free(ni->_IDM(bmp_rl).rl);
-		write_unlock(&ni->_IDM(bmp_rl).lock);
+		up_write(&ni->_IDM(bmp_rl).lock);
 	}
 	return;

Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/mft.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -U2 -r1.51 -r1.52
--- mft.c	4 Mar 2002 22:56:14 -0000	1.51
+++ mft.c	6 Mar 2002 16:01:26 -0000	1.52
@@ -206,7 +206,7 @@
 					vol->cluster_size_mask;
 			/* Convert the vcn to the corresponding lcn. */
-			read_lock(&ni->run_list.lock);
+			down_read(&ni->run_list.lock);
 			lcn = vcn_to_lcn(ni->run_list.rl, vcn);
-			read_unlock(&ni->run_list.lock);
+			up_read(&ni->run_list.lock);
 			if (lcn >= 0) {
 				/* Setup buffer head to correct block. */

Index: super.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/super.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -U2 -r1.81 -r1.82
--- super.c	5 Mar 2002 00:25:07 -0000	1.81
+++ super.c	6 Mar 2002 16:01:26 -0000	1.82
@@ -1132,8 +1132,8 @@
 	vol->mftbmp_mapping.host = NULL;
 	up_write(&vol->mftbmp_lock);
-	write_lock(&vol->mftbmp_rl.lock);
+	down_write(&vol->mftbmp_rl.lock);
 	ntfs_free(vol->mftbmp_rl.rl);
 	vol->mftbmp_rl.rl = NULL;
-	write_unlock(&vol->mftbmp_rl.lock);
+	up_write(&vol->mftbmp_rl.lock);
 	vol->upcase_len = 0;
 	/*
@@ -1509,5 +1509,5 @@
 #endif
 	spin_lock_init(&vol->mftbmp_mapping.i_shared_lock);
-	INIT_RUN_LIST(&vol->mftbmp_rl);
+	init_run_list(&vol->mftbmp_rl);
 	vol->mftmirr_ino = NULL;
 	vol->lcnbmp_ino = NULL;

Index: types.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/types.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- types.h	5 Mar 2002 00:22:24 -0000	1.5
+++ types.h	6 Mar 2002 16:01:26 -0000	1.6
@@ -68,16 +68,6 @@
 typedef struct {
 	run_list_element *rl;
-	rwlock_t lock;
+	struct rw_semaphore lock;
 } run_list;
-
-#define RUN_LIST_INIT		{ NULL, RW_LOCK_UNLOCKED }
-
-#define RUN_LIST(name)		run_list name = RUN_LIST_INIT
-
-#define INIT_RUN_LIST(runlist)	do {					\
-					run_list *___rl = runlist;	\
-					___rl->rl = NULL;		\
-					___rl->lock = RW_LOCK_UNLOCKED; \
-				} while (0)
 
 typedef enum {

[Linux-NTFS-cvs] CVS: ntfs-driver-tng ChangeLog,1.72,1.73

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

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-tng
In directory usw-pr-cvs1:/tmp/cvs-serv26232

Modified Files:
	ChangeLog 
Log Message:
Replace run list spinlock with a semaphore.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -U2 -r1.72 -r1.73
--- ChangeLog	5 Mar 2002 00:25:07 -0000	1.72
+++ ChangeLog	6 Mar 2002 16:01:25 -0000	1.73
@@ -97,9 +97,11 @@
 	- Rename run_list structure to run_list_element and create a new
 	  run_list structure containing a pointer to a run_list_element
-	  structure and a read/write spinlock. Adapt all usesrs of run lists
+	  structure and a read/write semaphore. Adapt all usesrs of run lists
 	  to new scheme and take and release the lock as needed. This fixes a
 	  nasty race as the run_list changes even when inodes are locked for
 	  reading and even when the inode isn't locked at all, so we really
-	  needed the serialization.
+	  needed the serialization. We use a semaphore rather than a spinlock
+	  as memory allocations can sleep and doing everything GFP_ATOMIC would
+	  be silly.
 	- Cleanup read_inode() removing all code checking for lowest_vcn != 0.
 	  This can never happen due to the nature of lookup_attr() and how we
@@ -109,4 +111,5 @@
 	  bad if found.
 	- Update to 2.5.6-pre2 changes in struct address_space.
+	- Use parent_ino() when accessing d_parent inode number in dir.c.
 
 tng-0.0.7 - 13/02/2002 - The driver is now feature complete for read-only!

[Linux-NTFS-cvs] CVS: ntfs-driver-tng/patches linux-2.5.3-ntfs-tng.diff,1.1,NONE

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

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-tng/patches
In directory usw-pr-cvs1:/tmp/cvs-serv12219

Removed Files:
	linux-2.5.3-ntfs-tng.diff 
Log Message:
Remove outdated patch


--- linux-2.5.3-ntfs-tng.diff DELETED ---

[Linux-NTFS-cvs] CVS: ntfs-driver-tng/scripts compat.c,1.10,1.11 rl.c,1.26,1.27

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/ntfs-driver-tng/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv3020/scripts

Modified Files:
	compat.c rl.c 
Log Message:
fix a few size problems in attrib.c, resync attrib.c and rl.c


Index: compat.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/scripts/compat.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- compat.c	25 Feb 2002 04:30:08 -0000	1.10
+++ compat.c	5 Mar 2002 02:35:02 -0000	1.11
@@ -19,4 +19,8 @@
 typedef unsigned long long u64;
 
+typedef struct {
+	volatile unsigned int lock;
+} rwlock_t;
+
 #include "linux/fs/ntfs/types.h"
 
@@ -258,5 +262,5 @@
 }
 
-void ntfs_debug_dump_runlist(const run_list *rl)
+void ntfs_debug_dump_runlist(const run_list_element *rl)
 {
 	int abbr = 0;	/* abbreviate long lists */

Index: rl.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/scripts/rl.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -U2 -r1.26 -r1.27
--- rl.c	25 Feb 2002 04:30:08 -0000	1.26
+++ rl.c	5 Mar 2002 02:35:02 -0000	1.27
@@ -5,19 +5,24 @@
 /**
  * rl_mm - run_list memmove
+ *
+ * It is up to the caller to serialize access to the run list @base.
  */
-static inline void rl_mm (run_list *base, int dst, int src, int size)
+static inline void rl_mm(run_list_element *base, int dst, int src, int size)
 {
 	if ((dst != src) && (size > 0))
-		memmove (base + dst, base + src, size * sizeof (run_list));
+		memmove (base + dst, base + src, size * sizeof (*base));
 }
 
 /**
  * rl_mc - run_list memory copy
+ *
+ * It is up to the caller to serialize access to the run lists @dstbase and
+ * @srcbase.
  */
-static inline void rl_mc (run_list *dstbase, int dst, run_list *srcbase,
-		int src, int size)
+static inline void rl_mc(run_list_element *dstbase, int dst,
+		run_list_element *srcbase, int src, int size)
 {
 	if (size > 0)
-		memcpy (dstbase+dst, srcbase+src, size * sizeof (run_list));
+		memcpy (dstbase+dst, srcbase+src, size * sizeof (*dstbase));
 }
 
@@ -32,4 +37,6 @@
  * memory, this function returns and entire page of memory.
  *
+ * It is up to the caller to serialize access to the run list @orig.
+ *
  * N.B.  If the new allocation doesn't require a different number of pages in
  *       memory, the function will return the original pointer.
@@ -40,10 +47,11 @@
  *         -EINVAL, Invalid parameters were passed in.
  */
-static inline run_list * ntfs_rl_realloc (run_list *orig, int old, int new)
+static inline run_list_element *ntfs_rl_realloc(run_list_element *orig,
+		int old, int new)
 {
-	run_list *nrl;
+	run_list_element *nrl;
 
-	old = PAGE_ALIGN (old * sizeof (run_list));
-	new = PAGE_ALIGN (new * sizeof (run_list));
+	old = PAGE_ALIGN (old * sizeof (*orig));
+	new = PAGE_ALIGN (new * sizeof (*orig));
 	if (old == new)
 		return orig;
@@ -68,8 +76,10 @@
  * must be adjacent.
  *
+ * It is up to the caller to serialize access to the run lists @one and @two.
+ *
  * Return: TRUE   Success, the run_lists were merged
  *         FALSE  Failure, the run_lists were not merged
  */
-static inline BOOL ntfs_rl_merge (run_list *one, run_list *two)
+static inline BOOL ntfs_rl_merge(run_list_element *one, run_list_element *two)
 {
 	BUG_ON (!one || !two);
@@ -96,7 +106,9 @@
  *
  * Append a run_list after element @loc in @orig.  Merge the right end of
- * the new run_list, if necesary.  Adjust the size of the hole before the
+ * the new run_list, if necessary.  Adjust the size of the hole before the
  * appended run_list.
  *
+ * It is up to the caller to serialize access to the run lists @orig and @new.
+ *
  * Return: Pointer, The new, combined, run_list
  *
@@ -104,13 +116,13 @@
  *         -EINVAL, Invalid parameters were passed in.
  */
-static inline run_list * ntfs_rl_append (run_list *orig, int osize,
-					 run_list *new,  int nsize, int loc)
+static inline run_list_element *ntfs_rl_append(run_list_element *orig,
+		int osize, run_list_element *new, int nsize, int loc)
 {
-	run_list *res;
+	run_list_element *res;
 	BOOL right;
 
 	BUG_ON (!orig || !new);
 
-	/* First, merge the right hand end, if necesary. */
+	/* First, merge the right hand end, if necessary. */
 	right = ntfs_rl_merge (new + nsize - 1, orig + loc + 1);
 
@@ -143,7 +155,9 @@
  *
  * Insert a run_list before element @loc in @orig.  Merge the left end of
- * the new run_list, if necesary.  Adjust the size of the hole after the
+ * the new run_list, if necessary.  Adjust the size of the hole after the
  * inserted run_list.
  *
+ * It is up to the caller to serialize access to the run lists @orig and @new.
+ *
  * Return: Pointer, The new, combined, run_list
  *
@@ -151,8 +165,8 @@
  *         -EINVAL, Invalid parameters were passed in.
  */
-static inline run_list * ntfs_rl_insert (run_list *orig, int osize,
-					 run_list *new,  int nsize, int loc)
+static inline run_list_element *ntfs_rl_insert(run_list_element *orig,
+		int osize, run_list_element *new, int nsize, int loc)
 {
-	run_list *res;
+	run_list_element *res;
 	BOOL left = FALSE;
 	BOOL disc = FALSE;	/* Discontinuity */
@@ -232,5 +246,7 @@
  *
  * Replace the run_list at @loc with @new.  Merge the left and right ends of
- * the inserted run_list, if necesary.
+ * the inserted run_list, if necessary.
+ *
+ * It is up to the caller to serialize access to the run lists @orig and @new.
  *
  * Return: Pointer, The new, combined, run_list
@@ -239,8 +255,8 @@
  *         -EINVAL, Invalid parameters were passed in.
  */
-static inline run_list * ntfs_rl_replace (run_list *orig, int osize,
-					  run_list *new, int nsize, int loc)
+static inline run_list_element *ntfs_rl_replace(run_list_element *orig,
+		int osize, run_list_element *new, int nsize, int loc)
 {
-	run_list *res;
+	run_list_element *res;
 	BOOL left = FALSE;
 	BOOL right;
@@ -282,4 +298,6 @@
  * run_lists is necessary.  Adjust the size of the holes either side.
  *
+ * It is up to the caller to serialize access to the run lists @orig and @new.
+ *
  * Return: Pointer, The new, combined, run_list
  *
@@ -287,8 +305,8 @@
  *         -EINVAL, Invalid parameters were passed in.
  */
-static inline run_list * ntfs_rl_split (run_list *orig, int osize,
-					run_list *new,  int nsize, int loc)
+static inline run_list_element *ntfs_rl_split(run_list_element *orig, int osize,
+		run_list_element *new, int nsize, int loc)
 {
-	run_list *res;
+	run_list_element *res;
 
 	BUG_ON (!orig || !new);
@@ -321,4 +339,6 @@
  * or completely within a hole in @drl.
  *
+ * It is up to the caller to serialize access to the run lists @drl and @srl.
+ *
  * Merging of run lists is necessary in two cases:
  *   1. When attribute lists are used and a further extent is being mapped.
@@ -341,7 +361,7 @@
  *         -ERANGE, The run_lists overlap and cannot be merged.
  */
-run_list * merge_run_lists (run_list *drl, run_list *srl)
+run_list_element *merge_run_lists(run_list_element *drl, run_list_element *srl)
 {
-	run_list *nrl;		/* New run list. */
+	run_list_element *nrl;	/* New run list. */
 	int di, si;		/* Current index into @[ds]rl. */
 	int sstart;		/* First index with lcn > LCN_RL_NOT_MAPPED. */
@@ -510,4 +530,6 @@
  * longer valid.
  *
+ * It is up to the caller to serialize access to the run list @old_rl.
+ *
  * Check the return value for error with IS_ERR(ret_val). If this is FALSE,
  * the function was successful, the return value is the new run list, and if
@@ -527,12 +549,12 @@
  * run list if overlap present and return error).
  */
-run_list *decompress_mapping_pairs(const ntfs_volume *vol,
-		const ATTR_RECORD *attr, run_list *old_rl)
+run_list_element *decompress_mapping_pairs(const ntfs_volume *vol,
+		const ATTR_RECORD *attr, run_list_element *old_rl)
 {
 	VCN vcn;		/* Current vcn. */
 	LCN lcn; 		/* Current lcn. */
 	s64 deltaxcn;		/* Change in [vl]cn. */
-	run_list *rl = NULL;	/* The output run_list. */
-	run_list *rl2;		/* Temporary run_list. */
+	run_list_element *rl = NULL;	/* The output run_list. */
+	run_list_element *rl2;	/* Temporary run_list. */
 	u8 *buf;		/* Current position in mapping pairs array. */
 	u8 *attr_end;		/* End of attribute. */
@@ -580,5 +602,5 @@
 		 * operates on whole pages only.
 		 */
-		if (((rlpos + 3) * sizeof(run_list)) > rlsize) {
+		if (((rlpos + 3) * sizeof(*old_rl)) > rlsize) {
 			rl2 = ntfs_malloc_nofs(rlsize + (int)PAGE_SIZE);
 			if (unlikely(!rl2)) {
@@ -754,7 +776,7 @@
  * pure_src
  */
-run_list *pure_src (BOOL contig, BOOL multi, int vcn, int len)
+run_list_element *pure_src (BOOL contig, BOOL multi, int vcn, int len)
 {
-	run_list *result;
+	run_list_element *result;
 	int fudge;
 
@@ -783,9 +805,9 @@
  */
 static void pure_test (int test, BOOL contig, BOOL multi,
-		int vcn, int len, run_list *file, int size)
+		int vcn, int len, run_list_element *file, int size)
 {
-	run_list *src;
-	run_list *dst;
-	run_list *res;
+	run_list_element *src;
+	run_list_element *dst;
+	run_list_element *res;
 
 	src = pure_src (contig, multi, vcn, len);
@@ -807,5 +829,5 @@
 {
 		/* VCN,  LCN, len */
-	static run_list file1[] = {
+	static run_list_element file1[] = {
 		{    0,   -1, 100 },	/* HOLE */
 		{  100, 1100, 100 },	/* DATA */
@@ -815,14 +837,14 @@
 		{  500,   -3,   0 }	/* NOENT */
 	};
-	static run_list file2[] = {
+	static run_list_element file2[] = {
 		{    0, 1000, 100 },	/* DATA */
 		{  100,   -1, 100 },	/* HOLE */
 		{  200,   -3,   0 }	/* NOENT */
 	};
-	static run_list file3[] = {
+	static run_list_element file3[] = {
 		{    0, 1000, 100 },	/* DATA */
 		{  100,   -3,   0 }	/* NOENT */
 	};
-	static run_list file4[] = {
+	static run_list_element file4[] = {
 		{    0,   -3,   0 }	/* NOENT */
 	};
@@ -873,6 +895,6 @@
 void zero (void)
 {
-	run_list *jim = NULL;
-	run_list *bob = NULL;
+	run_list_element *jim = NULL;
+	run_list_element *bob = NULL;
 
 	bob = ntfs_rl_realloc (bob, 0, 3);
@@ -895,7 +917,7 @@
 static void frag_combine (ntfs_volume *vol, ATTR_RECORD *attr1, ATTR_RECORD *attr2, ATTR_RECORD *attr3)
 {
-	run_list *run1;
-	run_list *run2;
-	run_list *run3;
+	run_list_element *run1;
+	run_list_element *run2;
+	run_list_element *run3;
 
 	run1 = decompress_mapping_pairs (vol, attr1, NULL);

[Linux-NTFS-cvs] CVS: ntfs-driver-tng/linux/fs/ntfs attrib.c,1.68,1.69

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv3020/linux/fs/ntfs

Modified Files:
	attrib.c 
Log Message:
fix a few size problems in attrib.c, resync attrib.c and rl.c


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/attrib.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -U2 -r1.68 -r1.69
--- attrib.c	4 Mar 2002 22:56:14 -0000	1.68
+++ attrib.c	5 Mar 2002 02:35:02 -0000	1.69
@@ -33,5 +33,5 @@
 {
 	if ((dst != src) && (size > 0))
-		memmove (base + dst, base + src, size * sizeof (run_list));
+		memmove (base + dst, base + src, size * sizeof (*base));
 }
 
@@ -46,5 +46,5 @@
 {
 	if (size > 0)
-		memcpy (dstbase+dst, srcbase+src, size * sizeof (run_list));
+		memcpy (dstbase+dst, srcbase+src, size * sizeof (*dstbase));
 }
 
@@ -74,6 +74,6 @@
 	run_list_element *nrl;
 
-	old = PAGE_ALIGN (old * sizeof (run_list));
-	new = PAGE_ALIGN (new * sizeof (run_list));
+	old = PAGE_ALIGN (old * sizeof (*orig));
+	new = PAGE_ALIGN (new * sizeof (*orig));
 	if (old == new)
 		return orig;
@@ -622,5 +622,5 @@
 		 * operates on whole pages only.
 		 */
-		if (((rlpos + 3) * sizeof(run_list)) > rlsize) {
+		if (((rlpos + 3) * sizeof(*old_rl)) > rlsize) {
 			rl2 = ntfs_malloc_nofs(rlsize + (int)PAGE_SIZE);
 			if (unlikely(!rl2)) {
@@ -923,5 +923,4 @@
 	return (LCN)LCN_ENOENT;
 }
-
 
 /**

[Linux-NTFS-cvs] CVS: ntfs-driver-tng/scripts ntfsextra.h,1.2,1.3

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/ntfs-driver-tng/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv7476

Modified Files:
	ntfsextra.h 
Log Message:
compatability defines moved to types.h


Index: ntfsextra.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/scripts/ntfsextra.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- ntfsextra.h	25 Feb 2002 04:00:58 -0000	1.2
+++ ntfsextra.h	5 Mar 2002 01:06:18 -0000	1.3
@@ -8,12 +8,4 @@
 #endif
 
-#if 1
-#define SN(X)   X	/* Struct Name */
-#define SC(P,N) P.N	/* ShortCut: Prefix, Name */
-#else
-#define SN(X)
-#define SC(P,N) N
-#endif
-
 #undef NTFS_RW
 

[Linux-NTFS-cvs] CVS: ntfs-driver-tng ChangeLog,1.71,1.72

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

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-tng
In directory usw-pr-cvs1:/tmp/cvs-serv22181

Modified Files:
	ChangeLog 
Log Message:
Update to 2.5.6-pre2


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -U2 -r1.71 -r1.72
--- ChangeLog	4 Mar 2002 23:48:05 -0000	1.71
+++ ChangeLog	5 Mar 2002 00:25:07 -0000	1.72
@@ -108,4 +108,5 @@
 	- Check for lowest_vcn != 0 in ntfs_read_inode() and mark the inode as
 	  bad if found.
+	- Update to 2.5.6-pre2 changes in struct address_space.
 
 tng-0.0.7 - 13/02/2002 - The driver is now feature complete for read-only!

[Linux-NTFS-cvs] CVS: ntfs-driver-tng/linux/fs/ntfs super.c,1.80,1.81

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

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv22181/linux/fs/ntfs

Modified Files:
	super.c 
Log Message:
Update to 2.5.6-pre2


Index: super.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/super.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -U2 -r1.80 -r1.81
--- super.c	5 Mar 2002 00:22:24 -0000	1.80
+++ super.c	5 Mar 2002 00:25:07 -0000	1.81
@@ -1500,6 +1500,12 @@
 	vol->mftbmp_mapping.a_ops = NULL;
 	vol->mftbmp_mapping.host = NULL;
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,6)
+	vol->mftbmp_mapping.i_mmap = NULL;
+	vol->mftbmp_mapping.i_mmap_shared = NULL;
+#else
 	INIT_LIST_HEAD(&vol->mftbmp_mapping.i_mmap);
 	INIT_LIST_HEAD(&vol->mftbmp_mapping.i_mmap_shared);
+#endif
 	spin_lock_init(&vol->mftbmp_mapping.i_shared_lock);
 	INIT_RUN_LIST(&vol->mftbmp_rl);