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

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.356,1.357 configure.ac,1.101,1.102

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

Changes by: antona

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
- Deal with missing syslog function by making code conditional on
  presence of syslog.h header file (DOS/djgpp).  (Christophe)
- Avoid clash with existing constants (OSX).  (Christophe)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -p -r1.356 -r1.357
--- ChangeLog	21 Feb 2006 04:40:20 -0000	1.356
+++ ChangeLog	22 Feb 2006 14:20:08 -0000	1.357
@@ -115,6 +115,9 @@
 	- Implement simple syslog logging handler (need more work), teach
 	  ntfsmount to use it.  (Yura)
 	- Fix a lot of bugs in attribute resizing code.  (Yura)
+	- Deal with missing syslog function by making code conditional on
+	  presence of syslog.h header file (DOS/djgpp).  (Christophe)
+	- Avoid clash with existing constants (OSX).  (Christophe)
 
 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.
 

Index: configure.ac
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- configure.ac	3 Feb 2006 23:40:39 -0000	1.101
+++ configure.ac	22 Feb 2006 14:20:08 -0000	1.102
@@ -332,7 +332,7 @@ AC_CHECK_HEADERS([ctype.h fcntl.h libgen
 	endian.h byteswap.h sys/byteorder.h sys/endian.h sys/param.h \
 	sys/ioctl.h sys/mount.h sys/stat.h sys/types.h sys/vfs.h \
 	sys/statvfs.h sys/sysmacros.h linux/major.h linux/fd.h linux/hdreg.h \
-	machine/endian.h gcrypt.h windows.h gnutls/pkcs12.h])
+	machine/endian.h gcrypt.h windows.h gnutls/pkcs12.h syslog.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.209,1.210

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	attrib.c 
Log Message:
While fixing allocated/compressed size I lost correct data size value by accident.


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -p -r1.209 -r1.210
--- attrib.c	21 Feb 2006 04:40:20 -0000	1.209
+++ attrib.c	21 Feb 2006 18:57:34 -0000	1.210
@@ -3750,11 +3750,16 @@ static int ntfs_resident_attr_resize(ntf
 		/* Perform the resize of the attribute record. */
 		if (!ntfs_resident_attr_value_resize(ctx->mrec, ctx->attr,
 				newsize)) {
-			/* Update the ntfs attribute structure, too. */
+			/* Update attribute size everywhere. */
 			na->data_size = na->initialized_size = newsize;
 			na->allocated_size = (newsize + 7) & ~7;
 			if (NAttrCompressed(na) || NAttrSparse(na))
 				na->compressed_size = na->allocated_size;
+			if (na->type == AT_DATA && na->name == AT_UNNAMED) {
+				na->ni->data_size = na->data_size;
+				na->ni->allocated_size = na->allocated_size;
+				NInoFileNameSetDirty(na->ni);
+			}
 			goto resize_done;
 		}
 		/* Error! If not enough space, just continue. */
@@ -4318,8 +4323,8 @@ retry:
 						new_compr_size);
 			}
 			/*
-			 * Set FILE_NAME dirty flag, to update sparse bit in
-			 * the index. Update allocated size in the index.
+			 * Set FILE_NAME dirty flag, to update sparse bit and
+			 * allocated size in the index.
 			 */
 			if (na->type == AT_DATA && na->name == AT_UNNAMED) {
 				if (sparse)
@@ -4669,6 +4674,11 @@ static int ntfs_non_resident_attr_shrink
 		na->initialized_size = newsize;
 		ctx->attr->initialized_size = cpu_to_sle64(newsize);
 	}
+	/* Update data size in the index. */
+	if (na->type == AT_DATA && na->name == AT_UNNAMED) {
+		na->ni->data_size = na->data_size;
+		NInoFileNameSetDirty(na->ni);
+	}
 
 	/* If the attribute now has zero size, make it resident. */
 	if (!newsize) {
@@ -4864,6 +4874,11 @@ static int ntfs_non_resident_attr_expand
 	/* Update data size. */
 	na->data_size = newsize;
 	ctx->attr->data_size = cpu_to_sle64(newsize);
+	/* Update data size in the index. */
+	if (na->type == AT_DATA && na->name == AT_UNNAMED) {
+		na->ni->data_size = na->data_size;
+		NInoFileNameSetDirty(na->ni);
+	}
 	/* Set the inode dirty so it is written out later. */
 	ntfs_inode_mark_dirty(ctx->ntfs_ino);
 	/* Done! */

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs layout.h,1.53,1.54

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

Changes by: antona

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

Modified Files:
	layout.h 
Log Message:
Update documentation for allocated_size in file name attribute.


Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- layout.h	4 Feb 2006 02:42:42 -0000	1.53
+++ layout.h	21 Feb 2006 11:43:49 -0000	1.54
@@ -1106,9 +1106,15 @@ typedef struct {
 					   modified. */
 /* 20*/	s64 last_access_time;		/* Last time this mft record was
 					   accessed. */
-/* 28*/	s64 allocated_size;		/* Byte size of allocated space for the
-					   data attribute. NOTE: Is a multiple
-					   of the cluster size. */
+/* 28*/	s64 allocated_size;		/* Byte size of on-disk allocated space
+					   for the data attribute.  So for
+					   normal $DATA, this is the
+					   allocated_size from the unnamed
+					   $DATA attribute and for compressed
+					   and/or sparse $DATA, this is the
+					   compressed_size from the unnamed
+					   $DATA attribute.  NOTE: This is a
+					   multiple of the cluster size. */
 /* 30*/	s64 data_size;			/* Byte size of actual data in data
 					   attribute. */
 /* 38*/	FILE_ATTR_FLAGS file_attributes;	/* Flags describing the file. */

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.208,1.209

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	attrib.c 
Log Message:
Fix runlist setting and incorrect file sizes in the index.


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -p -r1.208 -r1.209
--- attrib.c	21 Feb 2006 03:40:24 -0000	1.208
+++ attrib.c	21 Feb 2006 04:40:20 -0000	1.209
@@ -1337,7 +1337,7 @@ done:
 		ntfs_attr_put_search_ctx(ctx);
 	/* Update mapping pairs if needed. */
 	if (need_to.update_mapping_pairs)
-		ntfs_attr_update_mapping_pairs(na, update_from);
+		ntfs_attr_update_mapping_pairs(na, 0 /*update_from*/);
 	/* Finally, return the number of bytes written. */
 	return total;
 rl_err_out:
@@ -1395,7 +1395,7 @@ err_out:
 		ntfs_attr_put_search_ctx(ctx);
 	/* Update mapping pairs if needed. */
 	if (need_to.update_mapping_pairs)
-		ntfs_attr_update_mapping_pairs(na, update_from);
+		ntfs_attr_update_mapping_pairs(na, 0 /*update_from*/);
 	/* Restore original data_size if needed. */
 	if (need_to.undo_data_size && ntfs_attr_truncate(na, old_data_size))
 		ntfs_log_trace("Failed to restore data_size.\n");
@@ -4092,14 +4092,25 @@ static int ntfs_attr_make_resident(ntfs_
  * @na:		non-resident ntfs open attribute for which we need update
  * @from_vcn:	update runlist starting this VCN
  *
- * Build mapping pairs from na->runlist and write them to the disk. Also, this
- * function updates sparse bit and allocates/frees space for compressed_size,
- * but doesn't change it, so caller should update it manually.
+ * Build mapping pairs from @na->rl and write them to the disk. Also, this
+ * function updates sparse bit, allocated and compressed size (allocates/frees
+ * space for this field if required).
+ *
+ * @na->allocated_size should be set to correct value for the new runlist before
+ * call to this function. Vice-versa @na->compressed_size will be calculated and
+ * set to correct value during this function.
+ *
+ * FIXME: This function does not update sparse bit and compressed size correctly
+ * if called with @from_vcn != 0.
+ *
+ * FIXME: Rewrite without using NTFS_VCN_DELETE_MARK define.
  *
  * On success return 0 and on error return -1 with errno set to the error code.
  * The following error codes are defined:
+ *	EINVAL - Invalid arguments passed.
  *	ENOMEM - Not enough memory to complete operation.
- *	ENOSPC - There is no enough space in base mft to resize $ATTRIBUTE_LIST.
+ *	ENOSPC - There is no enough space in base mft to resize $ATTRIBUTE_LIST
+ *		 or there is no free MFT records left to allocate.
  */
 int ntfs_attr_update_mapping_pairs(ntfs_attr *na, VCN from_vcn)
 {
@@ -4112,7 +4123,7 @@ int ntfs_attr_update_mapping_pairs(ntfs_
 	BOOL finished_build;
 
 retry:
-	if (!na || !na->rl) {
+	if (!na || !na->rl || from_vcn) {
 		ntfs_log_trace("Invalid parameters passed.\n");
 		errno = EINVAL;
 		return -1;
@@ -4203,16 +4214,23 @@ retry:
 				goto put_err_out;
 			}
 		}
-		/* If we in the first extent, then set/clean sparse bit. */
+		/*
+		 * If we in the first extent, then set/clean sparse bit,
+		 * update allocated and compressed size.
+		 */
 		if (!a->lowest_vcn) {
 			int sparse;
 
+			/* Update allocated size. */
+			a->allocated_size = cpu_to_sle64(na->allocated_size);
+			/* Update sparse bit. */
 			sparse = ntfs_rl_sparse(na->rl);
 			if (sparse == -1) {
 				ntfs_log_trace("Bad runlist.\n");
 				err = EIO;
 				goto put_err_out;
 			}
+			/* Attribute become sparse. */
 			if (sparse && !(a->flags & (ATTR_IS_SPARSE |
 							ATTR_IS_COMPRESSED))) {
 				/*
@@ -4267,14 +4285,8 @@ retry:
 				a->mapping_pairs_offset =
 						cpu_to_le16(le16_to_cpu(
 						a->mapping_pairs_offset) + 8);
-				/*
-				 * Set FILE_NAME dirty flag, to update
-				 * sparse bit in the index.
-				 */
-				if (na->type == AT_DATA &&
-						na->name == AT_UNNAMED)
-					NInoFileNameSetDirty(na->ni);
 			}
+			/* Attribute no longer sparse. */
 			if (!sparse && (a->flags & ATTR_IS_SPARSE) &&
 					!(a->flags & ATTR_IS_COMPRESSED)) {
 				NAttrClearSparse(na);
@@ -4288,13 +4300,35 @@ retry:
 				a->mapping_pairs_offset =
 						cpu_to_le16(le16_to_cpu(
 						a->mapping_pairs_offset) - 8);
-				/*
-				 * Set FILE_NAME dirty flag, to update
-				 * sparse bit in the index.
-				 */
-				if (na->type == AT_DATA &&
-						na->name == AT_UNNAMED)
-					NInoFileNameSetDirty(na->ni);
+			}
+			/* Update compressed size if required. */
+			if (sparse) {
+				s64 new_compr_size;
+
+				new_compr_size = ntfs_rl_get_compressed_size(
+						na->ni->vol, na->rl);
+				if (new_compr_size == -1) {
+					err = errno;
+					ntfs_log_trace("BUG! Leaving inconstant"
+							" metadata.\n");
+					goto put_err_out;
+				}
+				na->compressed_size = new_compr_size;
+				a->compressed_size = cpu_to_sle64(
+						new_compr_size);
+			}
+			/*
+			 * Set FILE_NAME dirty flag, to update sparse bit in
+			 * the index. Update allocated size in the index.
+			 */
+			if (na->type == AT_DATA && na->name == AT_UNNAMED) {
+				if (sparse)
+					na->ni->allocated_size =
+							na->compressed_size;
+				else
+					na->ni->allocated_size =
+							na->allocated_size;
+				NInoFileNameSetDirty(na->ni);
 			}
 		}
 		/* Get the size for the rest of mapping pairs array. */
@@ -4533,7 +4567,6 @@ static int ntfs_non_resident_attr_shrink
 {
 	ntfs_volume *vol;
 	ntfs_attr_search_ctx *ctx;
-	ATTR_RECORD *a;
 	VCN first_free_vcn;
 	s64 nr_freed_clusters;
 	int err;
@@ -4598,11 +4631,14 @@ static int ntfs_non_resident_attr_shrink
 			return -1;
 		}
 
+		/* Prepare to mapping pairs update. */
+		na->allocated_size = first_free_vcn << vol->cluster_size_bits;
 		/* Write mapping pairs for new runlist. */
-		if (ntfs_attr_update_mapping_pairs(na, first_free_vcn)) {
+		if (ntfs_attr_update_mapping_pairs(na, 0 /*first_free_vcn*/)) {
 			err = errno;
-			ntfs_log_trace("Eeek! Mapping pairs update failed. Leaving "
-					"inconstant metadata. Run chkdsk.\n");
+			ntfs_log_trace("Eeek! Mapping pairs update failed. "
+					"Leaving inconstant metadata. "
+					"Run chkdsk.\n");
 			errno = err;
 			return -1;
 		}
@@ -4612,12 +4648,7 @@ static int ntfs_non_resident_attr_shrink
 	ctx = ntfs_attr_get_search_ctx(na->ni, NULL);
 	if (!ctx) {
 		err = errno;
-		if ((na->allocated_size >> vol->cluster_size_bits)
-						!= first_free_vcn)
-			ntfs_log_trace("Couldn't get attribute search context. "
-					"Leaving inconstant metadata.\n");
-		else
-			ntfs_log_trace("Couldn't get attribute search context.\n");
+		ntfs_log_trace("Couldn't get attribute search context.\n");
 		errno = err;
 		return -1;
 	}
@@ -4630,36 +4661,13 @@ static int ntfs_non_resident_attr_shrink
 				"Leaving inconstant metadata.\n");
 		goto put_err_out;
 	}
-	a = ctx->attr;
-
-	/* Update allocated size only if it is changed. */
-	if ((na->allocated_size >> vol->cluster_size_bits) != first_free_vcn) {
-		na->allocated_size = first_free_vcn << vol->cluster_size_bits;
-		a->allocated_size = cpu_to_sle64(na->allocated_size);
-
-		/* Update compressed_size if present. */
-		if (NAttrSparse(na) || NAttrCompressed(na)) {
-			s64 new_compr_size;
-
-			new_compr_size = ntfs_rl_get_compressed_size(vol,
-					na->rl);
-			if (new_compr_size == -1) {
-				err = errno;
-				ntfs_log_trace("BUG! Leaving inconstant "
-						"metadata.\n");
-				goto put_err_out;
-			}
-			na->compressed_size = new_compr_size;
-			a->compressed_size = cpu_to_sle64(new_compr_size);
-		}
-	}
 
 	/* Update data and initialized size. */
 	na->data_size = newsize;
-	a->data_size = cpu_to_sle64(newsize);
+	ctx->attr->data_size = cpu_to_sle64(newsize);
 	if (newsize < na->initialized_size) {
 		na->initialized_size = newsize;
-		a->initialized_size = cpu_to_sle64(newsize);
+		ctx->attr->initialized_size = cpu_to_sle64(newsize);
 	}
 
 	/* If the attribute now has zero size, make it resident. */
@@ -4667,8 +4675,8 @@ static int ntfs_non_resident_attr_shrink
 		if (ntfs_attr_make_resident(na, ctx)) {
 			/* If couldn't make resident, just continue. */
 			if (errno != EPERM)
-				ntfs_log_trace("Failed to make attribute resident. "
-						"Leaving as is...\n");
+				ntfs_log_error("Failed to make attribute "
+						"resident. Leaving as is...\n");
 		}
 	}
 
@@ -4701,10 +4709,10 @@ static int ntfs_non_resident_attr_expand
 {
 	LCN lcn_seek_from;
 	VCN first_free_vcn;
-	ATTR_RECORD *a;
 	ntfs_volume *vol;
 	ntfs_attr_search_ctx *ctx;
 	runlist *rl, *rln;
+	s64 org_alloc_size;
 	int err;
 
 	ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x, new size %lld, "
@@ -4729,6 +4737,8 @@ static int ntfs_non_resident_attr_expand
 		return -1;
 	}
 
+	/* Save for future use. */
+	org_alloc_size = na->allocated_size;
 	/* The first cluster outside the new allocation. */
 	first_free_vcn = (newsize + vol->cluster_size - 1) >>
 			vol->cluster_size_bits;
@@ -4816,9 +4826,11 @@ static int ntfs_non_resident_attr_expand
 		}
 		na->rl = rln;
 
+		/* Prepare to mapping pairs update. */
+		na->allocated_size = first_free_vcn << vol->cluster_size_bits;
 		/* Write mapping pairs for new runlist. */
-		if (ntfs_attr_update_mapping_pairs(na, na->allocated_size >>
-				vol->cluster_size_bits)) {
+		if (ntfs_attr_update_mapping_pairs(na, 0 /*na->allocated_size >>
+				vol->cluster_size_bits*/)) {
 			err = errno;
 			ntfs_log_trace("Eeek! Mapping pairs update failed.\n");
 			goto rollback;
@@ -4829,8 +4841,7 @@ static int ntfs_non_resident_attr_expand
 	if (!ctx) {
 		err = errno;
 		ntfs_log_trace("Failed to get search context.\n");
-		if ((na->allocated_size >> vol->cluster_size_bits) ==
-				first_free_vcn) {
+		if (na->allocated_size == org_alloc_size) {
 			errno = err;
 			return -1;
 		} else
@@ -4839,44 +4850,20 @@ static int ntfs_non_resident_attr_expand
 
 	if (ntfs_attr_lookup(na->type, na->name, na->name_len, CASE_SENSITIVE,
 			0, NULL, 0, ctx)) {
-		ntfs_log_trace("Eeek! Lookup of first attribute extent failed.\n");
 		err = errno;
+		ntfs_log_trace("Lookup of first attribute extent failed.\n");
 		if (err == ENOENT)
 			err = EIO;
-		if ((na->allocated_size >> vol->cluster_size_bits) !=
-				first_free_vcn) {
+		if (na->allocated_size != org_alloc_size) {
 			ntfs_attr_put_search_ctx(ctx);
 			goto rollback;
 		} else
 			goto put_err_out;
 	}
-	a = ctx->attr;
-
-	/* Update allocated and compressed size only if we changed runlist. */
-	if ((na->allocated_size >> vol->cluster_size_bits) < first_free_vcn) {
-		na->allocated_size = first_free_vcn << vol->cluster_size_bits;
-		a->allocated_size = cpu_to_sle64(na->allocated_size);
-
-		/* Update compressed_size if present. */
-		if (NAttrSparse(na) || NAttrCompressed(na)) {
-			s64 new_compr_size;
-
-			new_compr_size = ntfs_rl_get_compressed_size(vol,
-					na->rl);
-			if (new_compr_size == -1) {
-				err = errno;
-				ntfs_log_trace("BUG! Leaving inconstant "
-						"metadata.\n");
-				goto put_err_out;
-			}
-			na->compressed_size = new_compr_size;
-			a->compressed_size = cpu_to_sle64(new_compr_size);
-		}
-	}
 
 	/* Update data size. */
 	na->data_size = newsize;
-	a->data_size = cpu_to_sle64(newsize);
+	ctx->attr->data_size = cpu_to_sle64(newsize);
 	/* Set the inode dirty so it is written out later. */
 	ntfs_inode_mark_dirty(ctx->ntfs_ino);
 	/* Done! */
@@ -4884,27 +4871,28 @@ static int ntfs_non_resident_attr_expand
 	return 0;
 rollback:
 	/* Free allocated clusters. */
-	if (ntfs_cluster_free(vol, na, na->allocated_size >>
-					vol->cluster_size_bits, -1) < 0) {
+	if (ntfs_cluster_free(vol, na, org_alloc_size >>
+			vol->cluster_size_bits, -1) < 0) {
 		ntfs_log_trace("Eeek!  Leaking clusters.  Run chkdsk!\n");
 		err = EIO;
 	}
 	/* Now, truncate the runlist itself. */
-	if (ntfs_rl_truncate(&na->rl, na->allocated_size >>
-					vol->cluster_size_bits)) {
+	if (ntfs_rl_truncate(&na->rl, org_alloc_size >>
+			vol->cluster_size_bits)) {
 		/*
 		 * Failed to truncate the runlist, so just throw it away, it
 		 * will be mapped afresh on next use.
 		 */
 		free(na->rl);
 		na->rl = NULL;
-		ntfs_log_trace("Eeek! Couldn't truncate runlist. Rollback "
-				"failed.\n");
+		ntfs_log_trace("Couldn't truncate runlist. Rollback failed.\n");
 	} else {
+		/* Prepare to mapping pairs update. */
+		na->allocated_size = org_alloc_size << vol->cluster_size_bits;
 		/* Restore mapping pairs. */
-		if (ntfs_attr_update_mapping_pairs(na, na->allocated_size >>
-					vol->cluster_size_bits)) {
-			ntfs_log_trace("Eeek! Couldn't restore old mapping pairs. "
+		if (ntfs_attr_update_mapping_pairs(na, 0 /*na->allocated_size >>
+					vol->cluster_size_bits*/)) {
+			ntfs_log_trace("Failed to restore old mapping pairs. "
 					"Rollback failed.\n");
 		}
 	}
@@ -4970,20 +4958,6 @@ int ntfs_attr_truncate(ntfs_attr *na, co
 			ret = ntfs_non_resident_attr_shrink(na, newsize);
 	} else
 		ret = ntfs_resident_attr_resize(na, newsize);
-	/* Set FILE_NAME dirty flag, to update file length in the index. */
-	if (na->type == AT_DATA && na->name == AT_UNNAMED) {
-		na->ni->data_size = na->data_size;
-		/*
-		 * If attribute sparse or compressed then allocated size in
-		 * index should be equal to compressed size, not to allocated
-		 * size.
-		 */
-		if (NAttrCompressed(na) || NAttrSparse(na))
-			na->ni->allocated_size = na->compressed_size;
-		else
-			na->ni->allocated_size = na->allocated_size;
-		NInoFileNameSetDirty(na->ni);
-	}
 	/* Update access and change times if needed. */
 	if (na->type == AT_DATA || na->type == AT_INDEX_ROOT ||
 			na->type == AT_INDEX_ALLOCATION)

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.355,1.356

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	ChangeLog 
Log Message:
Fix runlist setting and incorrect file sizes in the index.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -p -r1.355 -r1.356
--- ChangeLog	13 Feb 2006 01:23:31 -0000	1.355
+++ ChangeLog	21 Feb 2006 04:40:20 -0000	1.356
@@ -82,10 +82,6 @@
 	  the less encountered flags, and reporting the in_use flag instead of
 	  inverting it to unused.  (Yuval)
 	- mkntfs: fix segfault when volume had more than 2^31 clusters.  (Szaka)
-	- Add @from_vcn parameter to ntfs_attr_update_mapping_pairs, update all
-	  users to submit it, thus write speed to very fragmented files
-	  dramatically increased, while write speed to low fragmented files
-	  stayed at approximately same level.  (Yura)
 	- Automatically update access and change time in ntfs_attr_p{read,write}
 	  and ntfs_attr_truncate.  (Yura)
 	- Add support of MS_NOATIME flag to ntfs_mount().  (Yura)
@@ -118,6 +114,7 @@
 	- ntfsresize, ntfsclone: always use MS_NOATIME.  (Szaka)
 	- Implement simple syslog logging handler (need more work), teach
 	  ntfsmount to use it.  (Yura)
+	- Fix a lot of bugs in attribute resizing code.  (Yura)
 
 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.207,1.208

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	attrib.c 
Log Message:
cleanup


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -p -r1.207 -r1.208
--- attrib.c	20 Feb 2006 00:48:35 -0000	1.207
+++ attrib.c	21 Feb 2006 03:40:24 -0000	1.208
@@ -4182,8 +4182,8 @@ retry:
 		 */
 		if (finished_build) {
 			ntfs_log_trace("Mark attr 0x%x for delete in inode "
-					"0x%llx.\n", (unsigned)le32_to_cpu(a->type),
-					ctx->ntfs_ino->mft_no);
+					"0x%llx.\n", (unsigned)le32_to_cpu(
+					a->type), ctx->ntfs_ino->mft_no);
 			a->highest_vcn = cpu_to_sle64(NTFS_VCN_DELETE_MARK);
 			ntfs_inode_mark_dirty(ctx->ntfs_ino);
 			continue;
@@ -4196,9 +4196,9 @@ retry:
 		if (a->name_length) {
 			if (le16_to_cpu(a->name_offset) >=
 					le16_to_cpu(a->mapping_pairs_offset)) {
-				ntfs_log_trace("Eeek! Damaged attribute. Name is "
-						"placed after the mapping pairs "
-						"array. Run chkdsk.\n");
+				ntfs_log_error("Damaged attribute. Name is "
+						"placed after the mapping "
+						"pairs array. Run chkdsk.\n");
 				err = EIO;
 				goto put_err_out;
 			}
@@ -4237,7 +4237,7 @@ retry:
 								8)) {
 						ntfs_log_trace("Failed to move "
 							"attribute to another "
-							"extent. Aborting...\n");
+							"extent. Aborting..\n");
 						err = errno;
 						goto put_err_out;
 					}
@@ -4246,10 +4246,10 @@ retry:
 				}
 				if (!(le32_to_cpu(a->length) - le16_to_cpu(
 						a->mapping_pairs_offset))) {
-					ntfs_log_trace("Size of the space allocated "
-							"for mapping pairs "
-							"should not be 0.  "
-							"Aborting ...\n");
+					ntfs_log_trace("Size of the space "
+							"allocated for mapping "
+							"pairs should not be 0."
+							"  Aborting ...\n");
 					err = EIO;
 					goto put_err_out;
 				}
@@ -4302,7 +4302,7 @@ retry:
 								stop_vcn);
 		if (mp_size <= 0) {
 			err = errno;
-			ntfs_log_trace("Eeek! Get size for mapping pairs failed.\n");
+			ntfs_log_trace("Get size for mapping pairs failed.\n");
 			goto put_err_out;
 		}
 		/*
@@ -4331,12 +4331,12 @@ retry:
 							cur_max_mp_size)) {
 					if (errno != ENOSPC)
 						return -1;
-					ntfs_log_trace("Attribute list mapping pairs "
-							"size to big, can't fit "
-							"them in the base MFT "
-							"record. Defragment "
-							"volume and try once "
-							"again.\n");
+					ntfs_log_error("Attribute list mapping "
+							"pairs size to big, "
+							"can't fit them in the "
+							"base MFT record. "
+							"Defragment volume and "
+							"try once again.\n");
 					errno = ENOSPC;
 					return -1;
 				}
@@ -4348,7 +4348,7 @@ retry:
 				ntfs_attr_put_search_ctx(ctx);
 				if (ntfs_inode_add_attrlist(base_ni)) {
 					err = errno;
-					ntfs_log_trace("Eeek! Couldn't add attribute "
+					ntfs_log_trace("Couldn't add attribute "
 							"list.\n");
 					errno = err;
 					return -1;
@@ -4427,8 +4427,8 @@ retry:
 			/* Remove unused attribute record. */
 			if (ntfs_attr_record_rm(ctx)) {
 				err = errno;
-				ntfs_log_trace("Couldn't remove unused attribute "
-						"record.\n");
+				ntfs_log_trace("Couldn't remove unused "
+						"attribute record.\n");
 				goto put_err_out;
 			}
 			ntfs_attr_reinit_search_ctx(ctx);
@@ -4452,7 +4452,7 @@ retry:
 						na->rl, stop_vcn);
 		if (mp_size <= 0) {
 			err = errno;
-			ntfs_log_trace("Eeek! Get size for mapping pairs failed.\n");
+			ntfs_log_trace("Get size for mapping pairs failed.\n");
 			goto put_err_out;
 		}
 		/* Allocate new mft record. */
@@ -4480,8 +4480,8 @@ retry:
 			 na->name, na->name_len, stop_vcn, mp_size, 0);
 		if (err == -1) {
 			err = errno;
-			ntfs_log_trace("Couldn't add attribute extent into the MFT "
-					"record.\n");
+			ntfs_log_trace("Couldn't add attribute extent into the "
+					"MFT record.\n");
 			if (ntfs_mft_record_free(na->ni->vol, ni)) {
 				ntfs_log_trace("Couldn't free MFT record.\n");
 			}

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.8.in,1.24,1.25

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.8.in 
Log Message:
update ntfsmount man page


Index: ntfsmount.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.8.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ntfsmount.8.in	6 Feb 2006 01:05:01 -0000	1.24
+++ ntfsmount.8.in	20 Feb 2006 17:11:24 -0000	1.25
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSMOUNT 8 "January 2006" "ntfsprogs @VERSION@"
+.TH NTFSMOUNT 8 "February 2006" "ntfsprogs @VERSION@"
 .SH NAME
 ntfsmount \- NTFS module for FUSE.
 .SH SYNOPSIS
@@ -134,6 +134,13 @@ to \fBwindows\fR, then the user can acce
 file:stream). If it's set to \fBxattr\fR, then the named data streams are
 mapped to xattrs and user can manipulate them using \fB{get,set}fattr\fR
 utilities.
+.TP
+.B debug
+Makes ntfsmount to not detach from terminal and print a lot of debug output from
+libntfs and FUSE.
+.TP
+.B no_detach
+Same as above but with less debug output.
 .SH DATA STREAMS
 All data on NTFS is stored in streams.  Every file has exactly one unnamed
 data stream and can have many named data streams.  The size of a file is the

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.206,1.207

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	attrib.c 
Log Message:
ntfs_attr_pwrite: Fix very serious bug, when sometimes not whole mapped runlist was passsed to ntfs_attr_update_mapping_pairs.


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- attrib.c	19 Feb 2006 00:37:15 -0000	1.206
+++ attrib.c	20 Feb 2006 00:48:35 -0000	1.207
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005 Anton Altaparmakov
  * Copyright (c) 2002-2005 Richard Russon
- * Copyright (c) 2004-2005 Yura Pakhuchiy
+ * Copyright (c) 2004-2006 Yura Pakhuchiy
  *
  * This program/include file is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as published
@@ -1166,6 +1166,25 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 			ntfs_log_trace("Instantiate the hole with vcn 0x%llx.\n",
 					cur_vcn);
 			/*
+			 * Map whole runlist to be able update mapping pairs
+			 * later.
+			 */
+			if (ntfs_attr_map_whole_runlist(na))
+				goto err_out;
+			/*
+			 * Restore @rl, it probably get lost during runlist
+			 * mapping.
+			 */
+			rl = ntfs_attr_find_vcn(na, cur_vcn);
+			if (!rl) {
+				ntfs_log_error("BUG! Failed to find run after "
+						"mapping whole runlist. Please "
+						"report to the %s.\n",
+						NTFS_DEV_LIST);
+				errno = EIO;
+				goto err_out;
+			}
+			/*
 			 * Search backwards to find the best lcn to start
 			 * seek from.
 			 */
@@ -1327,8 +1346,10 @@ rl_err_out:
 		if (need_to.undo_initialized_size) {
 			if (pos + total > na->initialized_size)
 				goto done;
-			// TODO: Need to try to change initialized_size. If it
-			// succeeds goto done, otherwise goto err_out. (AIA)
+			/*
+			 * TODO: Need to try to change initialized_size. If it
+			 * succeeds goto done, otherwise goto err_out. (AIA)
+			 */
 			errno = EOPNOTSUPP;
 			goto err_out;
 		}
@@ -1360,11 +1381,14 @@ err_out:
 			}
 		}
 		if (err) {
-			ntfs_log_debug("Eeek! Failed to recover from error. Leaving "
-				"metadata in inconsistent state! Run chkdsk!\n");
-			// FIXME: At this stage could try to recover by filling
-			// old_initialized_size -> new_initialized_size with
-			// data or at least zeroes. (AIA)
+			/*
+			 * FIXME: At this stage could try to recover by filling
+			 * old_initialized_size -> new_initialized_size with
+			 * data or at least zeroes. (AIA)
+			 */
+			ntfs_log_error("Eeek! Failed to recover from error. "
+					"Leaving metadata in inconsistent "
+					"state! Run chkdsk!\n");
 		}
 	}
 	if (ctx)

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.79,1.80

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
ntfsmount: add no_detach option


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- ntfsmount.c	13 Feb 2006 01:23:31 -0000	1.79
+++ ntfsmount.c	20 Feb 2006 00:32:01 -0000	1.80
@@ -99,6 +99,7 @@ typedef struct {
 	BOOL force;
 	BOOL debug;
 	BOOL noatime;
+	BOOL no_detach;
 } ntfs_fuse_context_t;
 
 typedef enum {
@@ -1602,6 +1603,13 @@ static char *parse_mount_options(const c
 			ctx->debug = TRUE;
 			ntfs_log_set_levels(NTFS_LOG_LEVEL_DEBUG);
 			ntfs_log_set_levels(NTFS_LOG_LEVEL_TRACE);
+		} else if (!strcmp(opt, "no_detach")) {
+			if (val) {
+				ntfs_log_error("'no_detach' option should not "
+						"have value.\n");
+				goto err_exit;
+			}
+			ctx->no_detach = TRUE;
 		} else if (!strcmp(opt, "remount")) {
 			ntfs_log_error("Remounting is not supported at present."
 					" You have to umount volume and then "
@@ -1818,7 +1826,7 @@ int main(int argc, char *argv[])
 	if (fuse_opt_add_arg(&margs, "") == -1 ||
 			fuse_opt_add_arg(&margs, "-o") == -1)
 		    fh = NULL;
-	if (!ctx->debug) {
+	if (!ctx->debug && !ctx->no_detach) {
 		if (fuse_opt_add_arg(&margs, "use_ino,kernel_cache") == -1)
 			fh = NULL;
 	} else {
@@ -1830,7 +1838,7 @@ int main(int argc, char *argv[])
 				sizeof(ntfs_fuse_oper));
 	fuse_opt_free_args(&margs);
 #else
-	if (!ctx->debug) {
+	if (!ctx->debug && !ctx->no_detach) {
 		if (fuse_is_lib_option("kernel_cache"))
 			fh = fuse_new(ffd, "use_ino,kernel_cache",
 					&ntfs_fuse_oper,
@@ -1849,7 +1857,7 @@ int main(int argc, char *argv[])
 		ntfs_fuse_destroy();
 		return 6;
 	}
-	if (!ctx->debug) {
+	if (!ctx->debug && !ctx->no_detach) {
 		if (daemon(0, 0))
 			ntfs_log_error("Failed to daemonize.\n");
 		else {

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfscmp.c,1.13,1.14

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

Changes by: szaka

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

Modified Files:
	ntfscmp.c 
Log Message:
Compare attribute headers as well. This nicely shows now that compression 
and allocation sizes aren't set correctly for sparse files in libntfs.


Index: ntfscmp.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscmp.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ntfscmp.c	26 Nov 2005 17:58:17 -0000	1.13
+++ ntfscmp.c	19 Feb 2006 12:50:54 -0000	1.14
@@ -1,8 +1,8 @@
 /**
  * ntfscmp - compare two NTFS volumes.
  *
+ * Copyright (c) 2005-2006 Szabolcs Szakacsits
  * Copyright (c) 2005 Anton Altaparmakov
- * Copyright (c) 2005 Szabolcs Szakacsits
  *
  * This utility is part of the Linux-NTFS project.
  */
@@ -520,6 +520,26 @@ static void cmp_attribute_data(ntfs_attr
 	exit(1);
 }
 
+static int cmp_attribute_header(ATTR_RECORD *a1, ATTR_RECORD *a2)
+{
+	int header_size = offsetof(ATTR_RECORD, resident_end);
+
+	if (a1->non_resident != a2->non_resident)
+		return 1;
+
+	if (a1->non_resident) {
+
+		if (a1->compression_unit != a2->compression_unit)
+			return 1;
+
+		header_size = offsetof(ATTR_RECORD, non_resident_end);
+		if (a1->compression_unit)
+			header_size = offsetof(ATTR_RECORD, compressed_end);
+	} 
+
+	return memcmp(a1, a2, header_size);
+}
+
 static void cmp_attribute(ntfs_attr_search_ctx *ctx1,
 			  ntfs_attr_search_ctx *ctx2)
 {
@@ -527,6 +547,11 @@ static void cmp_attribute(ntfs_attr_sear
 	ATTR_RECORD *a2 = ctx2->attr;
 	ntfs_attr *na1, *na2;
 
+	if (cmp_attribute_header(a1, a2)) {
+		print_ctx(ctx1);
+		printf("header:    DIFFER\n");
+	}
+
 	na1 = ntfs_attr_open(base_inode(ctx1), a1->type, GET_ATTR_NAME(a1));
 	na2 = ntfs_attr_open(base_inode(ctx2), a2->type, GET_ATTR_NAME(a2));
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.205,1.206 dir.c,1.54,1.55 index.c,1.24,1.25

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	attrib.c dir.c index.c 
Log Message:
cleanups 


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -p -r1.205 -r1.206
--- attrib.c	19 Feb 2006 00:36:23 -0000	1.205
+++ attrib.c	19 Feb 2006 00:37:15 -0000	1.206
@@ -4480,7 +4480,7 @@ retry:
 		}
 		a->highest_vcn = cpu_to_sle64(stop_vcn - 1);
 		ntfs_inode_mark_dirty(ni);
-		/* All mapping pairs are writed. */
+		/* All mapping pairs has been written. */
 		if (!err)
 			break;
 	}

Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- dir.c	10 Feb 2006 11:00:47 -0000	1.54
+++ dir.c	19 Feb 2006 00:37:15 -0000	1.55
@@ -1119,12 +1119,16 @@ static ntfs_inode *__ntfs_create(ntfs_in
 	/* Sanity checks. */
 	if (!dir_ni || !name || !name_len) {
 		ntfs_log_error("Invalid arguments.\n");
+		errno = EINVAL;
 		return NULL;
 	}
 	/* Allocate MFT record for new file. */
 	ni = ntfs_mft_record_alloc(dir_ni->vol, NULL);
 	if (!ni) {
-		ntfs_log_error("Failed to allocate new MFT record.\n");
+		err = errno;
+		ntfs_log_error("Failed to allocate new MFT record: %s.\n",
+				strerror(err));
+		errno = err;
 		return NULL;
 	}
 	/*
@@ -1150,7 +1154,8 @@ static ntfs_inode *__ntfs_create(ntfs_in
 	if (ntfs_attr_add(ni, AT_STANDARD_INFORMATION, AT_UNNAMED, 0,
 			(u8*)si, si_len)) {
 		err = errno;
-		ntfs_log_error("Failed to add STANDARD_INFORMATION attribute.\n");
+		ntfs_log_error("Failed to add STANDARD_INFORMATION "
+				"attribute.\n");
 		goto err_out;
 	}
 	if (S_ISDIR(type)) {
@@ -1280,7 +1285,8 @@ static ntfs_inode *__ntfs_create(ntfs_in
 	if (ntfs_index_add_filename(dir_ni, fn, MK_MREF(ni->mft_no,
 			le16_to_cpu(ni->mrec->sequence_number)))) {
 		err = errno;
-		ntfs_log_error("Failed to add entry to the index.\n");
+		ntfs_log_error("Failed to add entry to the index: %s.\n",
+				strerror(err));
 		goto err_out;
 	}
 	/* Set hard links count and directory flag. */
@@ -1506,6 +1512,7 @@ search:
 		ntfs_attr_reinit_search_ctx(actx);
 		goto search;
 	}
+	/* TODO: Update object id, quota and securiry indexes if required. */
 	/*
 	 * If hard link count is not equal to zero then we are done. In other
 	 * case there are no reference to this inode left, so we should free all

Index: index.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/index.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- index.c	4 Dec 2005 22:42:51 -0000	1.24
+++ index.c	19 Feb 2006 00:37:16 -0000	1.25
@@ -527,7 +527,8 @@ retry:
 					INDEX_ROOT, index))) {
 				err = EOPNOTSUPP;
 				ntfs_attr_close(na);
-				ntfs_log_error("Failed to truncate INDEX_ROOT.\n");
+				ntfs_log_debug("Failed to truncate "
+						"INDEX_ROOT.\n");
 				goto err_out;
 			}
 			ntfs_attr_close(na);

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.204,1.205

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	attrib.c 
Log Message:
fix bug with sparse attribute shinking when runlist is not changed. (already fixed such for expanding, do not know why I forgot to update shrinking)


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- attrib.c	10 Feb 2006 11:00:47 -0000	1.204
+++ attrib.c	19 Feb 2006 00:36:23 -0000	1.205
@@ -4612,20 +4612,22 @@ static int ntfs_non_resident_attr_shrink
 	if ((na->allocated_size >> vol->cluster_size_bits) != first_free_vcn) {
 		na->allocated_size = first_free_vcn << vol->cluster_size_bits;
 		a->allocated_size = cpu_to_sle64(na->allocated_size);
-	}
 
-	/* Update compressed_size if present. */
-	if (NAttrSparse(na) || NAttrCompressed(na)) {
-		s64 new_compr_size;
+		/* Update compressed_size if present. */
+		if (NAttrSparse(na) || NAttrCompressed(na)) {
+			s64 new_compr_size;
 
-		new_compr_size = ntfs_rl_get_compressed_size(vol, na->rl);
-		if (new_compr_size == -1) {
-			err = errno;
-			ntfs_log_trace("BUG! Leaving inconstant metadata.\n");
-			goto put_err_out;
+			new_compr_size = ntfs_rl_get_compressed_size(vol,
+					na->rl);
+			if (new_compr_size == -1) {
+				err = errno;
+				ntfs_log_trace("BUG! Leaving inconstant "
+						"metadata.\n");
+				goto put_err_out;
+			}
+			na->compressed_size = new_compr_size;
+			a->compressed_size = cpu_to_sle64(new_compr_size);
 		}
-		na->compressed_size = new_compr_size;
-		a->compressed_size = cpu_to_sle64(new_compr_size);
 	}
 
 	/* Update data and initialized size. */

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.8.in,1.29,1.30

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

Changes by: szaka

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

Modified Files:
	ntfsclone.8.in 
Log Message:
Add a section about windows cloning


Index: ntfsclone.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.8.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- ntfsclone.8.in	6 Feb 2006 01:05:01 -0000	1.29
+++ ntfsclone.8.in	18 Feb 2006 20:36:33 -0000	1.30
@@ -48,6 +48,26 @@ NTFS support then the file can be mounte
 .B   mount \-t ntfs \-o loop ntfsclone.img /mnt/ntfsclone
 .sp
 .RE
+.SS Windows Cloning
+If you want to copy, move or restore a system or boot partition to another 
+computer, or to a different disk or partition (e.g. hda1\->hda2, hda1\->hdb1
+or to a different disk sector offset) then you will need to take extra care.
+
+Usually, Windows will not be able to boot, unless you copy, move or restore 
+NTFS to the same partition which starts at the same sector on the same type 
+of disk having the same BIOS legacy cylinder setting as the original 
+partition and disk had.
+
+The ntfsclone utility guarantees to make an exact copy of NTFS but it 
+won't deal with booting issues. This is by design: ntfsclone is a 
+filesystem, not system utility. Its aim is only NTFS cloning, not Windows 
+cloning. Hereby ntfsclone can be used as a very fast and reliable 
+build block for Windows clonning but itself it's not enough. You 
+can find useful tips following the related links on the below page
+.br
+.nh
+http://wiki.linux-ntfs.org/doku.php?id=ntfsclone
+.hy
 .SS Sparse Files
 A file is sparse if it has unallocated blocks (holes). The reported size of
 such files are always higher than the disk space consumed by them.  The
@@ -321,17 +341,23 @@ was written by Szabolcs Szakacsits with 
 .B ntfsclone
 is part of the
 .B ntfsprogs
-package and is available from:
+package and is available at:
 .br
 .nh
 http://www.linux\-ntfs.org/content/view/19/37
 .hy
 .sp
-The manual pages are available online at:
+The latest manual pages are available at:
 .br
 .nh
 http://man.linux-ntfs.org/
 .hy
+.sp
+Additional up-to-date information can be found furthermore at:
+.br
+.nh
+http://wiki.linux-ntfs.org/doku.php?id=ntfsclone
+.hy
 .SH SEE ALSO
 .BR ntfsresize (8)
 .BR ntfsprogs (8)

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.78,1.79

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
implement POC of syslog logging handler, make ntfsmount to use it


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- ntfsmount.c	3 Feb 2006 22:19:22 -0000	1.78
+++ ntfsmount.c	13 Feb 2006 01:23:31 -0000	1.79
@@ -51,6 +51,7 @@
 #include <limits.h>
 #endif
 #include <getopt.h>
+#include <syslog.h>
 
 #ifdef HAVE_SETXATTR
 #include <sys/xattr.h>
@@ -516,8 +517,8 @@ static int ntfs_fuse_filler(ntfs_fuse_fi
 	if (name_type == FILE_NAME_DOS)
 		return 0;
 	if (ntfs_ucstombs(name, name_len, &filename, 0) < 0) {
-		ntfs_log_error("Skipping unrepresentable file (inode %lld): "
-				"%s\n", MREF(mref), strerror(errno));
+		ntfs_log_error("Skipping unrepresentable filename (inode %lld):"
+				" %s\n", MREF(mref), strerror(errno));
 		return 0;
 	}
 	if (ntfs_fuse_is_named_data_stream(filename)) {
@@ -1431,11 +1432,13 @@ static int ntfs_fuse_mount(const char *d
 static void ntfs_fuse_destroy(void)
 {
 	if (ctx->vol) {
-		ntfs_log_debug("Unmounting: %s\n", ctx->vol->vol_name);
+		ntfs_log_info("Unmounting %s (%s)\n", opts.device,
+				ctx->vol->vol_name);
 		if (ntfs_umount(ctx->vol, FALSE))
 			ntfs_log_perror("Failed to unmount volume");
 	}
 	free(ctx);
+	free(opts.device);
 }
 
 static void signal_handler(int arg __attribute__((unused)))
@@ -1782,7 +1785,6 @@ int main(int argc, char *argv[])
 	parsed_options = parse_mount_options((opts.options) ?
 			opts.options : "");
 	if (!parsed_options) {
-		free(opts.device);
 		ntfs_fuse_destroy();
 		return 3;
 	}
@@ -1790,10 +1792,8 @@ int main(int argc, char *argv[])
 	/* Mount volume. */
 	if (ntfs_fuse_mount(opts.device)) {
 		ntfs_fuse_destroy();
-		free(opts.device);
 		return 4;
 	}
-	free(opts.device);
 	/* Create filesystem. */
 #if defined(FUSE_VERSION) && (FUSE_VERSION >= 25)
 	if ((fuse_opt_add_arg(&margs, "") == -1 ||
@@ -1849,12 +1849,23 @@ int main(int argc, char *argv[])
 		ntfs_fuse_destroy();
 		return 6;
 	}
-	if (!ctx->debug && daemon(0, 0))
-		ntfs_log_error("Failed to daemonize.\n");
-	ntfs_log_info("Mounted: %s\n", ctx->vol->vol_name);
+	if (!ctx->debug) {
+		if (daemon(0, 0))
+			ntfs_log_error("Failed to daemonize.\n");
+		else {
+			ntfs_log_set_handler(ntfs_log_handler_syslog);
+			/* Override default libntfs ident. */
+			openlog(EXEC_NAME, LOG_PID, LOG_DAEMON);
+		}
+	}
+	ntfs_log_info("Version %s (libntfs %s)\n", VERSION,
+			ntfs_libntfs_version());
+	ntfs_log_info("Mounted %s (%s, label \"%s\", volume version %d.%d)\n",
+			opts.device, (ctx->ro) ? "RO" : "RW",
+			ctx->vol->vol_name, ctx->vol->major_ver,
+			ctx->vol->minor_ver);
 	/* Main loop. */
-	if (fuse_loop(fh))
-		ntfs_log_error("fuse_loop failed.\n");
+	fuse_loop(fh);
 	/* Destroy. */
 	fuse_destroy(fh);
 	close(ffd);

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs logging.c,1.9,1.10

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	logging.c 
Log Message:
implement POC of syslog logging handler, make ntfsmount to use it


Index: logging.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/logging.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- logging.c	10 Nov 2005 05:27:45 -0000	1.9
+++ logging.c	13 Feb 2006 01:23:31 -0000	1.10
@@ -38,6 +38,7 @@
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
+#include <syslog.h>
 
 #include "logging.h"
 
@@ -275,9 +276,11 @@ static const char * ntfs_log_get_prefix(
  */
 void ntfs_log_set_handler(ntfs_log_handler *handler)
 {
-	if (handler)
+	if (handler) {
 		ntfs_log.handler = handler;
-	else
+		if (handler == ntfs_log_handler_syslog)
+			openlog("libntfs", LOG_PID, LOG_USER);
+	} else
 		ntfs_log.handler = ntfs_log_handler_null;
 }
 
@@ -319,6 +322,79 @@ int ntfs_log_redirect(const char *functi
 
 
 /**
+ * ntfs_log_handler_syslog - syslog logging handler
+ * @function:	Function in which the log line occurred
+ * @file:	File in which the log line occurred
+ * @line:	Line number on which the log line occurred
+ * @level:	Level at which the line is logged
+ * @data:	User specified data, possibly specific to a handler
+ * @format:	printf-style formatting string
+ * @args:	Arguments to be formatted
+ *
+ * A simple syslog logging handler.  Ignores colors.
+ *
+ * Returns:  -1  Error occurred
+ *            0  Message wasn't logged
+ *          num  Number of output characters
+ */
+int ntfs_log_handler_syslog(const char *function  __attribute__((unused)),
+	const char *file, __attribute__((unused)) int line, u32 level,
+	void *data __attribute__((unused)), const char *format, va_list args)
+{
+	const int reason_size = 128;
+	static char *reason = NULL;
+	int ret = 0;
+	int olderr = errno;
+
+	if (level == NTFS_LOG_LEVEL_REASON) {
+		if (!reason)
+			reason = malloc(reason_size);
+		if (reason) {
+			memset(reason, 0, reason_size);
+			return vsnprintf(reason, reason_size, format, args);
+		} else {
+			/* Rather than call ourselves, just drop through */
+			level = NTFS_LOG_LEVEL_PERROR;
+			format = "Couldn't create reason";
+			args = NULL;
+			olderr = errno;
+		}
+	}
+
+	if ((ntfs_log.flags & NTFS_LOG_FLAG_ONLYNAME) &&
+	    (strchr(file, PATH_SEP)))		/* Abbreviate the filename */
+		file = strrchr(file, PATH_SEP) + 1;
+#if 0	/* FIXME: Implement this all. */
+	if (ntfs_log.flags & NTFS_LOG_FLAG_PREFIX)	/* Prefix the output */
+		ret += fprintf(stream, "%s", ntfs_log_get_prefix(level));
+
+	if (ntfs_log.flags & NTFS_LOG_FLAG_FILENAME)	/* Source filename */
+		ret += fprintf(stream, "%s ", file);
+
+	if (ntfs_log.flags & NTFS_LOG_FLAG_LINE)	/* Source line number */
+		ret += fprintf(stream, "(%d) ", line);
+
+	if ((ntfs_log.flags & NTFS_LOG_FLAG_FUNCTION) || /* Source function */
+	    (level & NTFS_LOG_LEVEL_TRACE))
+		ret += fprintf(stream, "%s(): ", function);
+
+	ret += vfprintf(stream, format, args);
+
+	if (level & NTFS_LOG_LEVEL_PERROR) {
+		if (reason)
+			ret += fprintf(stream, " : %s\n", reason);
+		else
+			ret += fprintf(stream, " : %s\n", strerror(olderr));
+	}
+#endif
+	vsyslog(LOG_NOTICE, format, args);
+	ret = 1; /* FIXME: caclulate how many bytes had been written. */
+
+	errno = olderr;
+	return ret;
+}
+
+/**
  * ntfs_log_handler_fprintf - Basic logging handler
  * @function:	Function in which the log line occurred
  * @file:	File in which the log line occurred

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs logging.h,1.4,1.5

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	logging.h 
Log Message:
implement POC of syslog logging handler, make ntfsmount to use it


Index: logging.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/logging.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- logging.h	28 Oct 2005 04:12:22 -0000	1.4
+++ logging.h	13 Feb 2006 01:23:31 -0000	1.5
@@ -40,6 +40,7 @@ typedef int (ntfs_log_handler)(const cha
 void ntfs_log_set_handler(ntfs_log_handler *handler);
 
 /* Logging handlers */
+ntfs_log_handler ntfs_log_handler_syslog  __attribute__((format(printf, 6, 0)));
 ntfs_log_handler ntfs_log_handler_fprintf __attribute__((format(printf, 6, 0)));
 ntfs_log_handler ntfs_log_handler_null    __attribute__((format(printf, 6, 0)));
 ntfs_log_handler ntfs_log_handler_stdout  __attribute__((format(printf, 6, 0)));

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.354,1.355

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	ChangeLog 
Log Message:
implement POC of syslog logging handler, make ntfsmount to use it


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -p -r1.354 -r1.355
--- ChangeLog	5 Feb 2006 16:39:35 -0000	1.354
+++ ChangeLog	13 Feb 2006 01:23:31 -0000	1.355
@@ -116,6 +116,8 @@
 	  determine using sysconf()).  (Anton)
 	- Fix tons of big-endian bugs in mkntfs.  (Anton)
 	- ntfsresize, ntfsclone: always use MS_NOATIME.  (Szaka)
+	- Implement simple syslog logging handler (need more work), teach
+	  ntfsmount to use it.  (Yura)
 
 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.c,1.110,1.111

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

Changes by: szaka

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

Modified Files:
	ntfsresize.c 
Log Message:
Restructure "Filesystem check failed!" message and have a more explanatory 
one in the ERROR line because several front-ends show only this line, nothing 
else, which greatly confused many users what's going on and what to do next.


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- ntfsresize.c	11 Feb 2006 19:55:05 -0000	1.110
+++ ntfsresize.c	12 Feb 2006 22:09:58 -0000	1.111
@@ -91,9 +91,9 @@ static const char *invalid_ntfs_msg =
 "if the disk was incorrectly repartitioned (see the ntfsresize FAQ).\n";
 
 static const char *corrupt_volume_msg =
-"This software has detected that your NTFS is corrupted. Please run chkdsk /f\n"
-"on Windows then reboot it TWICE! Important, don't forget the /f parameter!\n"
-"Afterwards you can run ntfsresize. No modification was made to NTFS.\n";
+"NTFS is inconsistent. Run chkdsk /f on Windows then reboot it TWICE!\n"
+"The usage of the /f parameter is very IMPORTANT! No modification was\n"
+"and will be made to NTFS by this software until it gets repaired.\n";
 
 static const char *hibernated_volume_msg =
 "The NTFS partition is hibernated. Windows must be resumed and turned off\n"
@@ -974,9 +974,9 @@ static void compare_bitmaps(ntfs_volume 
 	}
 done:
 	if (mismatch) {
-		err_printf("Filesystem check failed! Totally %d cluster "
-			   "accounting mismatches.\n", mismatch);
-		printf("%s", corrupt_volume_msg);
+		printf("Filesystem check failed! Totally %d cluster "
+		       "accounting mismatches.\n", mismatch);
+		err_printf("%s", corrupt_volume_msg);
 		exit(1);
 	}
 }

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsfix.c,1.28,1.29

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

Changes by: szaka

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

Modified Files:
	ntfsfix.c 
Log Message:
Update obsolete description


Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ntfsfix.c	20 Nov 2005 14:15:33 -0000	1.28
+++ ntfsfix.c	12 Feb 2006 02:00:45 -0000	1.29
@@ -1,14 +1,11 @@
 /**
- * NtfsFix - Part of the Linux-NTFS project.
+ * ntfsfix - Part of the Linux-NTFS project.
  *
  * Copyright (c) 2000-2005 Anton Altaparmakov.
+ * Copyright (c) 2002-2005 Szabolcs Szakacsits.
  *
- * This utility will attempt to fix a partition that has been damaged by the
- * current Linux-NTFS driver. It should be run after dismounting an NTFS
- * partition that has been mounted read-write under Linux and before rebooting
- * into Windows NT/2000. NtfsFix can be run even after Windows has had mounted
- * the partition, but it might be too late and irreversible damage to the data
- * might have been done already.
+ * This utility fixes some common NTFS problems, resets the NTFS journal file
+ * and schedules an NTFS consistency check for the first boot into Windows.
  *
  *	Anton Altaparmakov <ai...@ca...>
  *

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.8.in,1.35,1.36

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

Changes by: szaka

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

Modified Files:
	ntfsresize.8.in 
Log Message:
Update credit


Index: ntfsresize.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.8.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- ntfsresize.8.in	6 Feb 2006 01:05:01 -0000	1.35
+++ ntfsresize.8.in	12 Feb 2006 01:30:34 -0000	1.36
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSRESIZE 8 "January 2006" "ntfsprogs @VERSION@"
+.TH NTFSRESIZE 8 "February 2006" "ntfsprogs @VERSION@"
 .SH NAME
 ntfsresize \- resize an NTFS filesystem without data loss
 .SH SYNOPSIS
@@ -248,7 +248,7 @@ furthermore to Erik Meade, Martin Fick, 
 Lorrin Nelson, Geert Hendrickx, Robert Bjorkman and Richard Burdick
 for beta testing the relocation support, to Florian Eyben, Fritz Oppliger,
 Richard Ebling, Sid\-Ahmed Touati, Jan Kiszka, Benjamin Redelings, Christopher
-Haney, Ryan Durk, Ralf Beyer for the valued
+Haney, Ryan Durk, Ralf Beyer, Scott Hansen, Alan Evans for the valued
 contributions and to Theodore Ts'o whose
 .BR resize2fs (8)
 man page originally formed the basis of this page.

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.c,1.109,1.110

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

Changes by: szaka

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

Modified Files:
	ntfsresize.c 
Log Message:
Fix $BadClust:$Bad AT_ATTRIBUTE_LIST detection which bug was introduced 
recently only in the CVS version of ntfsresize; add also more info about 
bad sectors.


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- ntfsresize.c	5 Feb 2006 16:39:35 -0000	1.109
+++ ntfsresize.c	11 Feb 2006 19:55:05 -0000	1.110
@@ -118,6 +118,13 @@ static const char *bad_sectors_warning_m
 "* NTFS safely by additionally using the --bad-sectors option of ntfsresize.*\n"
 "****************************************************************************\n";
 
+static const char *many_bad_sectors_msg =
+"***************************************************************************\n"
+"* WARNING: The disk has many bad sectors. This means physical damage      *\n"
+"* on the disk surface caused by deterioration, manufacturing faults or    *\n"
+"* other reason. We suggest to get a replacement disk as soon as possible. *\n"
+"***************************************************************************\n";
+
 struct {
 	int verbose;
 	int debug;
@@ -2034,6 +2041,7 @@ static void lookup_data_attr(ntfs_volume
 static int check_bad_sectors(ntfs_volume *vol)
 {
 	ntfs_attr_search_ctx *ctx;
+	ntfs_inode *base_ni;
 	runlist *rl;
 	s64 i, badclusters = 0;
 
@@ -2041,14 +2049,24 @@ static int check_bad_sectors(ntfs_volume
 
 	lookup_data_attr(vol, FILE_BadClus, "$Bad", &ctx);
 
-	if (NInoAttrList(ctx->ntfs_ino))
-		err_exit("Hopelessly many bad sectors! Please report to "
-			 "%s\n", NTFS_DEV_LIST);
+	base_ni = ctx->base_ntfs_ino;
+	if (!base_ni)
+		base_ni = ctx->ntfs_ino;
+
+	if (NInoAttrList(base_ni)) {
+		err_printf("Hopelessly many bad sectors has been detected!\n");
+		printf("%s", many_bad_sectors_msg);
+		exit(1);
+	}
 
 	if (!ctx->attr->non_resident)
 		err_exit("Resident attribute in $BadClust! Please report to "
 			 "%s\n", NTFS_DEV_LIST);
-
+	/* 
+	 * FIXME: The below would be partial for non-base records in the
+	 * not yet supported multi-record case. Alternatively use audited
+	 * ntfs_attr_truncate after an umount & mount.
+	 */
 	if (!(rl = ntfs_mapping_pairs_decompress(vol, ctx->attr, NULL)))
 		perr_exit("Decompressing $BadClust:$Bad mapping pairs failed");
 
@@ -2058,8 +2076,9 @@ static int check_bad_sectors(ntfs_volume
 			continue;
 
 		badclusters += rl[i].length;
-		ntfs_log_verbose("Bad cluster: %8lld - %lld\n", rl[i].lcn,
-			rl[i].lcn + rl[i].length - 1);
+		ntfs_log_verbose("Bad cluster: %#8llx - %#llx    (%lld)\n",
+				 rl[i].lcn, rl[i].lcn + rl[i].length - 1,
+				 rl[i].length);
 	}
 
 	if (badclusters) {

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.203,1.204 bitmap.c,1.21,1.22 dir.c,1.53,1.54 lcnalloc.c,1.34,1.35

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	attrib.c bitmap.c dir.c lcnalloc.c 
Log Message:
cleanup


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- attrib.c	9 Feb 2006 21:40:00 -0000	1.203
+++ attrib.c	10 Feb 2006 11:00:47 -0000	1.204
@@ -681,7 +681,7 @@ runlist_element *ntfs_attr_find_vcn(ntfs
 		errno = EINVAL;
 		return NULL;
 	}
-	
+
 	ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x, vcn %llx\n",
 		       (unsigned long long)na->ni->mft_no, na->type,
 		       (long long)vcn);
@@ -1580,7 +1580,7 @@ static int ntfs_attr_find(const ATTR_TYP
 	ntfs_volume *vol;
 	ntfschar *upcase;
 	u32 upcase_len;
-	
+
 	ntfs_log_trace("Entering.\n");
 
 	if (ctx->ntfs_ino) {
@@ -3909,7 +3909,7 @@ static int ntfs_attr_make_resident(ntfs_
 	ATTR_REC *a = ctx->attr;
 	int name_ofs, val_ofs, err = EIO;
 	s64 arec_size, bytes_read;
-	
+
 	ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x.\n", (unsigned long
 			long)na->ni->mft_no, na->type);
 
@@ -4916,7 +4916,7 @@ int ntfs_attr_truncate(ntfs_attr *na, co
 		errno = EINVAL;
 		return -1;
 	}
-	
+
 	ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x.\n", (unsigned long
 			long)na->ni->mft_no, na->type);
 

Index: bitmap.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/bitmap.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- bitmap.c	9 Feb 2006 21:40:00 -0000	1.21
+++ bitmap.c	10 Feb 2006 11:00:47 -0000	1.22
@@ -226,7 +226,7 @@ int ntfs_bitmap_clear_run(ntfs_attr *na,
 {
 	ntfs_log_trace("Dealloc from bit 0x%llx, count 0x%llx.\n",
 		       (long long)start_bit, (long long)count);
-	 
+
 	return ntfs_bitmap_set_bits_in_run(na, start_bit, count, 0);
 }
 

Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- dir.c	9 Feb 2006 21:43:52 -0000	1.53
+++ dir.c	10 Feb 2006 11:00:47 -0000	1.54
@@ -1110,7 +1110,6 @@ static ntfs_inode *__ntfs_create(ntfs_in
 		ntfschar *target, u8 target_len)
 {
 	ntfs_inode *ni;
-	ntfs_attr *na;
 	int rollback_data = 0;
 	FILE_NAME_ATTR *fn = NULL;
 	STANDARD_INFORMATION *si = NULL;
@@ -1186,7 +1185,8 @@ static ntfs_inode *__ntfs_create(ntfs_in
 		ie->key_length = 0;
 		ie->flags = INDEX_ENTRY_END;
 		/* Add INDEX_ROOT attribute to inode. */
-		if (ntfs_attr_add(ni, AT_INDEX_ROOT, NTFS_INDEX_I30, 4, (u8*)ir, ir_len)) {
+		if (ntfs_attr_add(ni, AT_INDEX_ROOT, NTFS_INDEX_I30, 4,
+				(u8*)ir, ir_len)) {
 			err = errno;
 			free(ir);
 			ntfs_log_error("Failed to add INDEX_ROOT attribute.\n");
@@ -1296,6 +1296,8 @@ static ntfs_inode *__ntfs_create(ntfs_in
 err_out:
 	ntfs_log_trace("Failed.\n");
 	if (rollback_data) {
+		ntfs_attr *na;
+
 		na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0);
 		if (!na)
 			ntfs_log_perror("Failed to open data attribute of "

Index: lcnalloc.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/lcnalloc.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- lcnalloc.c	9 Feb 2006 21:40:00 -0000	1.34
+++ lcnalloc.c	10 Feb 2006 11:00:47 -0000	1.35
@@ -763,7 +763,7 @@ int ntfs_cluster_free(ntfs_volume *vol, 
 	ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x, count 0x%llx, "
 		       "vcn 0x%llx.\n", (unsigned long long)na->ni->mft_no,
 		       na->type, (long long)count, (long long)start_vcn);
-	
+
 	rl = ntfs_attr_find_vcn(na, start_vcn);
 	if (!rl) {
 		if (errno == ENOENT)

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs dir.c,1.52,1.53

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

Changes by: szaka

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

Modified Files:
	dir.c 
Log Message:
__ntfs_create(): fix cluster leaks for some special files when index entry 
creation fails


Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- dir.c	30 Jan 2006 22:10:31 -0000	1.52
+++ dir.c	9 Feb 2006 21:43:52 -0000	1.53
@@ -1110,6 +1110,8 @@ static ntfs_inode *__ntfs_create(ntfs_in
 		ntfschar *target, u8 target_len)
 {
 	ntfs_inode *ni;
+	ntfs_attr *na;
+	int rollback_data = 0;
 	FILE_NAME_ATTR *fn = NULL;
 	STANDARD_INFORMATION *si = NULL;
 	int err, fn_len, si_len;
@@ -1244,8 +1246,8 @@ static ntfs_inode *__ntfs_create(ntfs_in
 			ntfs_log_error("Failed to add DATA attribute.\n");
 			goto err_out;
 		}
-		if (data)
-			free(data);
+		rollback_data = 1;
+		free(data);
 	}
 	/* Create FILE_NAME attribute. */
 	fn_len = sizeof(FILE_NAME_ATTR) + name_len * sizeof(ntfschar);
@@ -1293,6 +1295,17 @@ static ntfs_inode *__ntfs_create(ntfs_in
 	return ni;
 err_out:
 	ntfs_log_trace("Failed.\n");
+	if (rollback_data) {
+		na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0);
+		if (!na)
+			ntfs_log_perror("Failed to open data attribute of "
+					" inode 0x%llx. Run chkdsk.\n",
+					(unsigned long long)ni->mft_no);
+		else if (ntfs_attr_rm(na))
+			ntfs_log_perror("Failed to remove data attribute of "
+					"inode 0x%llx. Run chkdsk.\n",
+					(unsigned long long)ni->mft_no);
+	}
 	if (ntfs_mft_record_free(ni->vol, ni))
 		ntfs_log_error("Failed to free MFT record.  "
 				"Leaving inconsistent metadata. Run chkdsk.\n");

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.202,1.203 bitmap.c,1.20,1.21 inode.c,1.80,1.81 lcnalloc.c,1.33,1.34

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

Changes by: szaka

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

Modified Files:
	attrib.c bitmap.c inode.c lcnalloc.c 
Log Message:
Add some important debugging, tracing info


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- attrib.c	18 Dec 2005 16:27:20 -0000	1.202
+++ attrib.c	9 Feb 2006 21:40:00 -0000	1.203
@@ -629,6 +629,9 @@ LCN ntfs_attr_vcn_to_lcn(ntfs_attr *na, 
 
 	if (!na || !NAttrNonResident(na) || vcn < 0)
 		return (LCN)LCN_EINVAL;
+
+	ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x.\n", (unsigned long
+			long)na->ni->mft_no, na->type);
 retry:
 	/* Convert vcn to lcn. If that fails map the runlist and retry once. */
 	lcn = ntfs_rl_vcn_to_lcn(na->rl, vcn);
@@ -678,6 +681,10 @@ runlist_element *ntfs_attr_find_vcn(ntfs
 		errno = EINVAL;
 		return NULL;
 	}
+	
+	ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x, vcn %llx\n",
+		       (unsigned long long)na->ni->mft_no, na->type,
+		       (long long)vcn);
 retry:
 	rl = na->rl;
 	if (!rl)
@@ -1573,6 +1580,8 @@ static int ntfs_attr_find(const ATTR_TYP
 	ntfs_volume *vol;
 	ntfschar *upcase;
 	u32 upcase_len;
+	
+	ntfs_log_trace("Entering.\n");
 
 	if (ctx->ntfs_ino) {
 		vol = ctx->ntfs_ino->vol;
@@ -3250,6 +3259,8 @@ int ntfs_attr_record_resize(MFT_RECORD *
 int ntfs_resident_attr_value_resize(MFT_RECORD *m, ATTR_RECORD *a,
 		const u32 new_size)
 {
+	ntfs_log_trace("Entering for new size %u.\n", (unsigned)new_size);
+
 	/*
 	 * Check that the attribute name hasn't been placed after the
 	 * attribute value. Chkdsk treat this as corruption.
@@ -3498,6 +3509,9 @@ static int ntfs_attr_make_non_resident(n
 	runlist *rl;
 	int mp_size, mp_ofs, name_ofs, arec_size, err;
 
+	ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x.\n", (unsigned long
+			long)na->ni->mft_no, na->type);
+
 	/* Some preliminary sanity checking. */
 	if (NAttrNonResident(na)) {
 		ntfs_log_trace("Eeek!  Trying to make non-resident attribute "
@@ -3679,6 +3693,7 @@ static int ntfs_resident_attr_resize(ntf
 
 	ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x.\n", (unsigned long
 			long)na->ni->mft_no, na->type);
+
 	/* Get the attribute record that needs modification. */
 	ctx = ntfs_attr_get_search_ctx(na->ni, NULL);
 	if (!ctx)
@@ -3894,6 +3909,9 @@ static int ntfs_attr_make_resident(ntfs_
 	ATTR_REC *a = ctx->attr;
 	int name_ofs, val_ofs, err = EIO;
 	s64 arec_size, bytes_read;
+	
+	ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x.\n", (unsigned long
+			long)na->ni->mft_no, na->type);
 
 	/* Should be called for the first extent of the attribute. */
 	if (sle64_to_cpu(a->lowest_vcn)) {
@@ -4898,6 +4916,9 @@ int ntfs_attr_truncate(ntfs_attr *na, co
 		errno = EINVAL;
 		return -1;
 	}
+	
+	ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x.\n", (unsigned long
+			long)na->ni->mft_no, na->type);
 
 	if (na->data_size == newsize)
 		return 0;

Index: bitmap.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/bitmap.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- bitmap.c	2 Feb 2006 14:40:53 -0000	1.20
+++ bitmap.c	9 Feb 2006 21:40:00 -0000	1.21
@@ -224,6 +224,9 @@ int ntfs_bitmap_set_run(ntfs_attr *na, s
  */
 int ntfs_bitmap_clear_run(ntfs_attr *na, s64 start_bit, s64 count)
 {
+	ntfs_log_trace("Dealloc from bit 0x%llx, count 0x%llx.\n",
+		       (long long)start_bit, (long long)count);
+	 
 	return ntfs_bitmap_set_bits_in_run(na, start_bit, count, 0);
 }
 

Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/inode.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- inode.c	18 Nov 2005 16:18:18 -0000	1.80
+++ inode.c	9 Feb 2006 21:40:00 -0000	1.81
@@ -252,6 +252,8 @@ int ntfs_inode_close(ntfs_inode *ni)
 	if (!ni)
 		return 0;
 
+	ntfs_log_trace("Entering for inode 0x%llx.\n", (long long) ni->mft_no);
+
 	/* If we have dirty metadata, write it out. */
 	if (NInoDirty(ni) || NInoAttrListDirty(ni)) {
 		if (ntfs_inode_sync(ni)) {
@@ -473,6 +475,8 @@ static int ntfs_inode_sync_standard_info
 	STANDARD_INFORMATION *std_info;
 	int err;
 
+	ntfs_log_trace("Entering for inode 0x%llx.\n", (long long) ni->mft_no);
+
 	ctx = ntfs_attr_get_search_ctx(ni, NULL);
 	if (!ctx)
 		return -1;
@@ -513,6 +517,8 @@ static int ntfs_inode_sync_file_name(ntf
 	FILE_NAME_ATTR *fn;
 	int err = 0;
 
+	ntfs_log_trace("Entering for inode 0x%llx.\n", (long long) ni->mft_no);
+
 	ctx = ntfs_attr_get_search_ctx(ni, NULL);
 	if (!ctx) {
 		err = errno;

Index: lcnalloc.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/lcnalloc.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- lcnalloc.c	21 Oct 2005 18:05:13 -0000	1.33
+++ lcnalloc.c	9 Feb 2006 21:40:00 -0000	1.34
@@ -715,7 +715,13 @@ err_ret:
  */
 int ntfs_cluster_free_from_rl(ntfs_volume *vol, runlist *rl)
 {
+	ntfs_log_trace("Entering.\n");
+
 	for (; rl->length; rl++) {
+
+		ntfs_log_trace("Dealloc lcn 0x%llx, len 0x%llx.\n",
+			       (long long)rl->lcn, (long long)rl->length);
+
 		if (rl->lcn >= 0 && ntfs_bitmap_clear_run(vol->lcnbmp_na,
 				rl->lcn, rl->length)) {
 			int eo = errno;
@@ -754,7 +760,10 @@ int ntfs_cluster_free(ntfs_volume *vol, 
 		errno = EINVAL;
 		return -1;
 	}
-
+	ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x, count 0x%llx, "
+		       "vcn 0x%llx.\n", (unsigned long long)na->ni->mft_no,
+		       na->type, (long long)count, (long long)start_vcn);
+	
 	rl = ntfs_attr_find_vcn(na, start_vcn);
 	if (!rl) {
 		if (errno == ENOENT)

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs runlist.c,1.67,1.68

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

Changes by: antona

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

Modified Files:
	runlist.c 
Log Message:
Fix two potential runlist merge bugs (one was without effect the other possible
free memory dereference).
Fix the "make test" testing of the rl mering code to work again (it needs to
use printf not the fancy logging macros).


Index: runlist.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/runlist.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- runlist.c	4 Dec 2005 22:42:51 -0000	1.67
+++ runlist.c	8 Feb 2006 22:15:30 -0000	1.68
@@ -347,6 +347,7 @@ static __inline__ runlist_element *ntfs_
 static __inline__ runlist_element *ntfs_rl_replace(runlist_element *dst,
 		int dsize, runlist_element *src, int ssize, int loc)
 {
+	signed delta;
 	BOOL left  = FALSE;	/* Left end of @src needs merging */
 	BOOL right = FALSE;	/* Right end of @src needs merging */
 	int tail;		/* Start of tail of @dst */
@@ -366,11 +367,14 @@ static __inline__ runlist_element *ntfs_
 		left = ntfs_rl_are_mergeable(dst + loc - 1, src);
 
 	/* Allocate some space. We'll need less if the left, right, or both
-	 * ends get merged.
+	 * ends get merged.  The -1 accounts for the run being replaced.
 	 */
-	dst = ntfs_rl_realloc(dst, dsize, dsize + ssize - left - right);
-	if (!dst)
-		return NULL;
+	delta = ssize - 1 - left - right;
+	if (delta > 0) {
+		dst = ntfs_rl_realloc(dst, dsize, dsize + delta);
+		if (!dst)
+			return NULL;
+	}
 	/*
 	 * We are guaranteed to succeed from here so can start modifying the
 	 * original runlists.
@@ -1733,20 +1737,20 @@ static void test_rl_dump_runlist(const r
 	const char *lcn_str[5] = { "HOLE", "NOTMAP", "ENOENT", "XXXX" };
 
 	if (!rl) {
-		ntfs_log_debug("    Run list not present.\n");
+		printf("    Run list not present.\n");
 		return;
 	}
 
 	if (abbr)
 		for (len = 0; rl[len].length; len++) ;
 
-	ntfs_log_debug("     VCN      LCN      len\n");
+	printf("     VCN      LCN      len\n");
 	for (i = 0; ; i++, rl++) {
 		LCN lcn = rl->lcn;
 
 		if ((abbr) && (len > 20)) {
 			if (i == 4)
-				ntfs_log_debug("     ...\n");
+				printf("     ...\n");
 			if ((i > 3) && (i < (len - 3)))
 				continue;
 		}
@@ -1756,17 +1760,17 @@ static void test_rl_dump_runlist(const r
 
 			if (ind > -LCN_ENOENT - 1)
 				ind = 3;
-			ntfs_log_debug("%8lld %8s %8lld\n",
+			printf("%8lld %8s %8lld\n",
 				rl->vcn, lcn_str[ind], rl->length);
 		} else
-			ntfs_log_debug("%8lld %8lld %8lld\n",
+			printf("%8lld %8lld %8lld\n",
 				rl->vcn, rl->lcn, rl->length);
 		if (!rl->length)
 			break;
 	}
 	if ((abbr) && (len > 20))
-		ntfs_log_debug("    (%d entries)\n", len+1);
-	ntfs_log_debug("\n");
+		printf("    (%d entries)\n", len+1);
+	printf("\n");
 }
 
 /**
@@ -1782,14 +1786,14 @@ static runlist_element * test_rl_runlist
 {
 	runlist_element *res = NULL;
 
-	ntfs_log_debug("dst:\n");
+	printf("dst:\n");
 	test_rl_dump_runlist(drl);
-	ntfs_log_debug("src:\n");
+	printf("src:\n");
 	test_rl_dump_runlist(srl);
 
 	res = ntfs_runlists_merge(drl, srl);
 
-	ntfs_log_debug("res:\n");
+	printf("res:\n");
 	test_rl_dump_runlist(res);
 
 	return res;
@@ -1811,12 +1815,12 @@ static int test_rl_read_buffer(const cha
 
 	fptr = fopen(file, "r");
 	if (!fptr) {
-		ntfs_log_debug("open %s\n", file);
+		printf("open %s\n", file);
 		return 0;
 	}
 
 	if (fread(buf, bufsize, 1, fptr) == 99) {
-		ntfs_log_debug("read %s\n", file);
+		printf("read %s\n", file);
 		return 0;
 	}
 
@@ -1884,7 +1888,7 @@ static void test_rl_pure_test(int test, 
 
 	memcpy(dst, file, size);
 
-	ntfs_log_debug("Test %2d ----------\n", test);
+	printf("Test %2d ----------\n", test);
 	res = test_rl_runlists_merge(dst, src);
 
 	free(res);
@@ -1942,7 +1946,7 @@ static void test_rl_pure(char *contig, c
 	else if (strcmp(contig, "noncontig") == 0)
 		c = FALSE;
 	else {
-		ntfs_log_debug("rl pure [contig|noncontig] [single|multi]\n");
+		printf("rl pure [contig|noncontig] [single|multi]\n");
 		return;
 	}
 	if (strcmp(multi, "multi") == 0)
@@ -1950,7 +1954,7 @@ static void test_rl_pure(char *contig, c
 	else if (strcmp(multi, "single") == 0)
 		m = FALSE;
 	else {
-		ntfs_log_debug("rl pure [contig|noncontig] [single|multi]\n");
+		printf("rl pure [contig|noncontig] [single|multi]\n");
 		return;
 	}
 
@@ -2089,7 +2093,8 @@ static void test_rl_frag(char *test)
 	else if (strcmp(test, "231") == 0)  test_rl_frag_combine(&vol, attr2, attr3, attr1);
 	else if (strcmp(test, "312") == 0)  test_rl_frag_combine(&vol, attr3, attr1, attr2);
 	else if (strcmp(test, "321") == 0)  test_rl_frag_combine(&vol, attr3, attr2, attr1);
-	else ntfs_log_debug("Frag: No such test '%s'\n", test);
+	else
+		printf("Frag: No such test '%s'\n", test);
 
 out:
 	free(attr1);
@@ -2111,7 +2116,8 @@ int test_rl_main(int argc, char *argv[])
 	if      ((argc == 2) && (strcmp(argv[1], "zero") == 0)) test_rl_zero();
 	else if ((argc == 3) && (strcmp(argv[1], "frag") == 0)) test_rl_frag(argv[2]);
 	else if ((argc == 4) && (strcmp(argv[1], "pure") == 0)) test_rl_pure(argv[2], argv[3]);
-	else ntfs_log_debug("rl [zero|frag|pure] {args}\n");
+	else
+		printf("rl [zero|frag|pure] {args}\n");
 
 	return 0;
 }