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

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs index.c,1.37,1.38

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv29280/libntfs

Modified Files:
	index.c 
Log Message:
port from ntfs-3g fixes to error cases in index code


Index: index.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/index.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- index.c	30 Oct 2006 19:40:56 -0000	1.37
+++ index.c	20 Nov 2006 17:30:13 -0000	1.38
@@ -976,7 +976,7 @@ out:
 	return vcn;
 }
 
-static INDEX_BLOCK *ntfs_ir_to_ia(INDEX_ROOT *ir, VCN ib_vcn)
+static INDEX_BLOCK *ntfs_ir_to_ib(INDEX_ROOT *ir, VCN ib_vcn)
 {
 	INDEX_BLOCK *ib;
 	INDEX_ENTRY *ie_last;
@@ -1003,26 +1003,42 @@ static INDEX_BLOCK *ntfs_ir_to_ia(INDEX_
 	ib->index.flags = ir->index.flags;
 	ib->index.index_length = cpu_to_le32(i +
 			le32_to_cpu(ib->index.entries_offset));
-	/*
-	 * Move the index root termination entry forward
-	 */
+	return ib;
+}
+
+static void ntfs_ir_nill(INDEX_ROOT *ir)
+{
+	INDEX_ENTRY *ie_last;
+	char *ies_start, *ies_end;
+
+	ntfs_log_trace("Entering\n");
+	/* TODO: This function could be much simpler. */
+	ies_start = (char *)ntfs_ie_get_first(&ir->index);
+	ies_end   = (char *)ntfs_ie_get_end(&ir->index);
+	ie_last   = ntfs_ie_get_last((INDEX_ENTRY *)ies_start, ies_end);
+	/* Move the index root termination entry forward. */
 	if ((char *)ie_last > ies_start) {
 		memmove(ies_start, (char *)ie_last, le16_to_cpu(
 					ie_last->length));
 		ie_last = (INDEX_ENTRY *)ies_start;
 	}
-	return ib;
 }
 
 static int ntfs_ib_copy_tail(ntfs_index_context *icx, INDEX_BLOCK *src,
-			     INDEX_BLOCK *dst, INDEX_ENTRY *median, VCN new_vcn)
+			     INDEX_ENTRY *median, VCN new_vcn)
 {
 	u8 *ies_end;
 	INDEX_ENTRY *ie_head;		/* first entry after the median */
-	int tail_size;
+	int tail_size, ret;
+	INDEX_BLOCK *dst;
 
 	ntfs_log_trace("Entering.\n");
 
+	dst = ntfs_ib_alloc(new_vcn, icx->block_size, 
+			    src->index.flags & NODE_MASK);
+	if (!dst)
+		return STATUS_ERROR;
+
 	ie_head = ntfs_ie_get_next(median);
 
 	ies_end = (u8 *)ntfs_ie_get_end(&src->index);
@@ -1032,10 +1048,10 @@ static int ntfs_ib_copy_tail(ntfs_index_
 	dst->index.index_length = cpu_to_le32(tail_size +
 			le32_to_cpu(dst->index.entries_offset));
 
-	if (ntfs_ib_write(icx, new_vcn, dst))
-		return STATUS_ERROR;
+	ret = ntfs_ib_write(icx, new_vcn, dst);
 
-	return STATUS_OK;
+	free(dst);
+	return ret;
 }
 
 static int ntfs_ib_cut_tail(ntfs_index_context *icx, INDEX_BLOCK *src,
@@ -1109,11 +1125,16 @@ static int ntfs_ir_reparent(ntfs_index_c
 	if (new_ib_vcn == -1)
 		goto err_out;
 
-	ib = ntfs_ir_to_ia(ir, new_ib_vcn);
-	if (ib == NULL) {
-		ntfs_log_perror("Failed to create AT_INDEX_ALLOCATION");
-		goto err_out;
-	}
+	ib = ntfs_ir_to_ib(ir, new_ib_vcn);
+ 	if (ib == NULL) {
+		ntfs_log_perror("Failed to move index root to index block");
+		goto clear_bmp;
+ 	}
+ 
+	if (ntfs_ib_write(icx, new_ib_vcn, ib))
+		goto clear_bmp;
+
+	ntfs_ir_nill(ir);
 
 	ie = ntfs_ie_get_first(&ir->index);
 	ie->flags |= INDEX_ENTRY_NODE;
@@ -1132,14 +1153,14 @@ static int ntfs_ir_reparent(ntfs_index_c
 		goto err_out;
 	ntfs_inode_mark_dirty(ctx->ntfs_ino);
 
-	if (ntfs_ib_write(icx, new_ib_vcn, ib))
-		goto err_out;
-
 	ret = STATUS_OK;
 err_out:
 	ntfs_attr_put_search_ctx(ctx);
 	free(ib);
 	return ret;
+clear_bmp:
+	ntfs_ibm_clear(icx, new_ib_vcn);
+	goto err_out;
 }
 
 /**
@@ -1341,10 +1362,9 @@ err_out:
  */
 static int ntfs_ib_split(ntfs_index_context *icx, INDEX_BLOCK *ib)
 {
-	INDEX_BLOCK *ib_new;
 	INDEX_ENTRY *median;
 	VCN new_vcn;
-	int ret, err = STATUS_ERROR;
+	int ret;
 
 	ntfs_log_trace("Entering.\n");
 
@@ -1356,6 +1376,11 @@ static int ntfs_ib_split(ntfs_index_cont
 	if (new_vcn == -1)
 		return STATUS_ERROR;
 
+	if (ntfs_ib_copy_tail(icx, ib, median, new_vcn)) {
+		ntfs_ibm_clear(icx, new_vcn);
+		return STATUS_ERROR;
+	}
+
 	if (ntfs_icx_parent_vcn(icx) == VCN_INDEX_ROOT_PARENT)
 		ret = ntfs_ir_insert_median(icx, median, new_vcn);
 	else
@@ -1368,21 +1393,8 @@ static int ntfs_ib_split(ntfs_index_cont
 		return ret;
 	}
 
-	ib_new = ntfs_ib_alloc(new_vcn, icx->block_size,
-			       ib->index.flags & NODE_MASK);
-	if (!ib_new)
-		return STATUS_ERROR;
-
-	if (ntfs_ib_copy_tail(icx, ib, ib_new, median, new_vcn))
-		goto free_ib_new;
-
-	if (ntfs_ib_cut_tail(icx, ib, median))
-		goto free_ib_new;
-
-	err = STATUS_OK;
-free_ib_new:
-	free(ib_new);
-	return err;
+	ret = ntfs_ib_cut_tail(icx, ib, median);
+	return ret;
 }
 
 static int ntfs_ie_add(ntfs_index_context *icx, INDEX_ENTRY *ie)

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.417,1.418

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357:/tmp/cvs-serv23120

Modified Files:
	ChangeLog 
Log Message:
Windows cares only about first 4 records in $MFTMirr and ignores
everything beyond them. Update libntfs behaviour to be like in
windows. Leave @mftmirr_size for case if will want to change something in the
future.


Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -p -r1.417 -r1.418
--- ChangeLog	15 Nov 2006 23:15:17 -0000	1.417
+++ ChangeLog	20 Nov 2006 16:21:57 -0000	1.418
@@ -69,6 +69,9 @@ xx/xx/2006 - x.xx.x - .
 	  NTFS_MNT_CASE_SENSITIVE.  (Yura)
 	- Treat filenames in POSIX namespace as case insensitive in case of
 	  case insensitive mounts.  (Anton, Yura)
+	- Windows cares only about first 4 records in $MFTMirr and ignores
+	  everything beyond them. Update libntfs behaviour to be like in
+	  windows.  (Yura)
 
 21/06/2006 - 1.13.1 - Various fixes.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs bootsect.c, 1.21, 1.22 mft.c, 1.49, 1.50 volume.c, 1.77, 1.78

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv23120/libntfs

Modified Files:
	bootsect.c mft.c volume.c 
Log Message:
Windows cares only about first 4 records in $MFTMirr and ignores
everything beyond them. Update libntfs behaviour to be like in
windows. Leave @mftmirr_size for case if will want to change something in the
future.


Index: bootsect.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/bootsect.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- bootsect.c	19 Nov 2006 20:19:18 -0000	1.21
+++ bootsect.c	20 Nov 2006 16:21:57 -0000	1.22
@@ -261,16 +261,9 @@ int ntfs_boot_sector_parse(ntfs_volume *
 			(unsigned)vol->indx_record_size);
 	ntfs_log_debug("INDXRecordSizeBits = %u\n", vol->indx_record_size_bits);
 	/*
-	 * Work out the size of the MFT mirror in number of mft records. If the
-	 * cluster size is less than or equal to the size taken by four mft
-	 * records, the mft mirror stores the first four mft records. If the
-	 * cluster size is bigger than the size taken by four mft records, the
-	 * mft mirror contains as many mft records as will fit into one
-	 * cluster.
+	 * Windows cares only about first 4 records in $MFTMirr and inores
+	 * everything beyend them.
 	 */
-	if (vol->cluster_size <= 4 * vol->mft_record_size)
-		vol->mftmirr_size = 4;
-	else
-		vol->mftmirr_size = vol->cluster_size / vol->mft_record_size;
+	vol->mftmirr_size = 4;
 	return 0;
 }

Index: mft.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/mft.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- mft.c	6 Nov 2006 17:11:02 -0000	1.49
+++ mft.c	20 Nov 2006 16:21:57 -0000	1.50
@@ -169,7 +169,7 @@ int ntfs_mft_records_write(const ntfs_vo
 		if (bw != -1)
 			errno = EIO;
 		if (bw >= 0)
-			ntfs_log_debug("Error: partial write while writing $Mft "
+			ntfs_log_error("Partial write while writing $Mft "
 					"record(s)!\n");
 		else
 			ntfs_log_perror("Error writing $Mft record(s)");

Index: volume.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- volume.c	20 Nov 2006 15:59:14 -0000	1.77
+++ volume.c	20 Nov 2006 16:21:57 -0000	1.78
@@ -340,8 +340,7 @@ error_exit:
  */
 static int ntfs_mftmirr_load(ntfs_volume *vol)
 {
-	int i;
-	runlist_element rl[2];
+	int err;
 
 	vol->mftmirr_ni = ntfs_inode_open(vol, FILE_MFTMirr);
 	if (!vol->mftmirr_ni) {
@@ -359,36 +358,27 @@ static int ntfs_mftmirr_load(ntfs_volume
 		ntfs_log_perror("Failed to map runlist of $MFTMirr/$DATA");
 		goto error_exit;
 	}
-	/* Construct the mft mirror runlist. */
-	rl[0].vcn = 0;
-	rl[0].lcn = vol->mftmirr_lcn;
-	rl[0].length = (vol->mftmirr_size * vol->mft_record_size +
-			vol->cluster_size - 1) / vol->cluster_size;
-	rl[1].vcn = rl[0].length;
-	rl[1].lcn = LCN_ENOENT;
-	rl[1].length = 0;
-	/* Compare the two runlists. They must be identical. */
-	i = 0;
-	do {
-		if (rl[i].vcn != vol->mftmirr_na->rl[i].vcn ||
-				rl[i].lcn != vol->mftmirr_na->rl[i].lcn ||
-				rl[i].length != vol->mftmirr_na->rl[i].length) {
-			ntfs_log_debug("Error: $MFTMirr location mismatch! Run "
-					"chkdsk.\n");
-			errno = EIO;
-			goto error_exit;
-		}
-	} while (rl[i++].length);
+	/* Check $MFTMirr runlist. */
+	if (vol->mftmirr_na->rl[0].lcn != vol->mftmirr_lcn ||
+			vol->mftmirr_na->rl[0].length < (vol->mftmirr_size *
+			vol->mft_record_size + vol->cluster_size - 1) /
+			vol->cluster_size) {
+		ntfs_log_error("$MFTMirr location mismatch or first 4 records "
+				"are fragmented. Run chkdsk.\n");
+		errno = EIO;
+		goto error_exit;
+
+	}
 	return 0;
 error_exit:
-	i = errno;
+	err = errno;
 	if (vol->mftmirr_na) {
 		ntfs_attr_close(vol->mftmirr_na);
 		vol->mftmirr_na = NULL;
 	}
 	ntfs_inode_close(vol->mftmirr_ni);
 	vol->mftmirr_ni = NULL;
-	errno = i;
+	errno = err;
 	return -1;
 }
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs volume.c,1.76,1.77

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv17824/libntfs

Modified Files:
	volume.c 
Log Message:
cleanups


Index: volume.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- volume.c	19 Nov 2006 20:19:18 -0000	1.76
+++ volume.c	20 Nov 2006 15:59:14 -0000	1.77
@@ -117,7 +117,7 @@ static void __ntfs_volume_release(ntfs_v
 		if (NDevDirty(dev))
 			dev->d_ops->sync(dev);
 		if (dev->d_ops->close(dev))
-			ntfs_log_perror("Failed to close the device.  Error: ");
+			ntfs_log_perror("Failed to close the device");
 	}
 	free(v->vol_name);
 	free(v->upcase);
@@ -164,12 +164,12 @@ static int ntfs_mft_load(ntfs_volume *vo
 		goto error_exit;
 	}
 	if (ntfs_is_baad_record(mb->magic)) {
-		ntfs_log_debug("Error: Incomplete multi sector transfer detected in "
+		ntfs_log_error("Incomplete multi sector transfer detected in "
 				"$MFT.\n");
 		goto io_error_exit;
 	}
 	if (!ntfs_is_mft_record(mb->magic)) {
-		ntfs_log_debug("Error: $MFT has invalid magic.\n");
+		ntfs_log_error("$MFT has invalid magic.\n");
 		goto io_error_exit;
 	}
 	ctx = ntfs_attr_get_search_ctx(vol->mft_ni, NULL);
@@ -179,14 +179,14 @@ static int ntfs_mft_load(ntfs_volume *vo
 	}
 	if (p2n(ctx->attr) < p2n(mb) ||
 			(char*)ctx->attr > (char*)mb + vol->mft_record_size) {
-		ntfs_log_debug("Error: $MFT is corrupt.\n");
+		ntfs_log_error("$MFT is corrupt.\n");
 		goto io_error_exit;
 	}
 	/* Find the $ATTRIBUTE_LIST attribute in $MFT if present. */
 	if (ntfs_attr_lookup(AT_ATTRIBUTE_LIST, AT_UNNAMED, 0, 0, 0, NULL, 0,
 			ctx)) {
 		if (errno != ENOENT) {
-			ntfs_log_debug("Error: $MFT has corrupt attribute list.\n");
+			ntfs_log_error("$MFT has corrupt attribute list.\n");
 			goto io_error_exit;
 		}
 		goto mft_has_no_attr_list;
@@ -194,7 +194,7 @@ static int ntfs_mft_load(ntfs_volume *vo
 	NInoSetAttrList(vol->mft_ni);
 	l = ntfs_get_attribute_value_length(ctx->attr);
 	if (l <= 0 || l > 0x40000) {
-		ntfs_log_debug("Error: $MFT/$ATTRIBUTE_LIST has invalid length.\n");
+		ntfs_log_error("$MFT/$ATTRIBUTE_LIST has invalid length.\n");
 		goto io_error_exit;
 	}
 	vol->mft_ni->attr_list_size = l;
@@ -204,13 +204,13 @@ static int ntfs_mft_load(ntfs_volume *vo
 
 	l = ntfs_get_attribute_value(vol, ctx->attr, vol->mft_ni->attr_list);
 	if (!l) {
-		ntfs_log_debug("Error: failed to get value of "
+		ntfs_log_error("Failed to get value of "
 				"$MFT/$ATTRIBUTE_LIST.\n");
 		goto io_error_exit;
 	}
 	if (l != vol->mft_ni->attr_list_size) {
-		ntfs_log_debug("Error: got unexpected amount of data when reading "
-				"$MFT/$ATTRIBUTE_LIST.\n");
+		ntfs_log_error("Got unexpected amount of data when "
+				"reading $MFT/$ATTRIBUTE_LIST.\n");
 		goto io_error_exit;
 	}
 mft_has_no_attr_list:
@@ -240,17 +240,18 @@ mft_has_no_attr_list:
 		a = ctx->attr;
 		/* $MFT must be non-resident. */
 		if (!a->non_resident) {
-			ntfs_log_debug("$MFT must be non-resident but a resident "
-					"extent was found. $MFT is corrupt. Run "
-					"chkdsk.\n");
+			ntfs_log_error("$MFT must be non-resident but a "
+					"resident extent was found. $MFT is "
+					"corrupt. Run chkdsk.\n");
 			goto io_error_exit;
 		}
 		/* $MFT must be uncompressed and unencrypted. */
 		if (a->flags & ATTR_COMPRESSION_MASK ||
 				a->flags & ATTR_IS_ENCRYPTED) {
-			ntfs_log_debug("$MFT must be uncompressed and unencrypted "
-					"but a compressed/encrypted extent was "
-					"found. $MFT is corrupt. Run chkdsk.\n");
+			ntfs_log_error("$MFT must be uncompressed and "
+					"unencrypted but a compressed/encrypted"
+					" extent was found. $MFT is corrupt. "
+					"Run chkdsk.\n");
 			goto io_error_exit;
 		}
 		/*
@@ -261,7 +262,8 @@ mft_has_no_attr_list:
 		 */
 		nrl = ntfs_mapping_pairs_decompress(vol, a, vol->mft_na->rl);
 		if (!nrl) {
-			ntfs_log_perror("ntfs_mapping_pairs_decompress() failed");
+			ntfs_log_perror("ntfs_mapping_pairs_decompress() "
+					"failed");
 			goto error_exit;
 		}
 		vol->mft_na->rl = nrl;
@@ -276,21 +278,22 @@ mft_has_no_attr_list:
 
 		/* Avoid endless loops due to corruption. */
 		if (next_vcn < sle64_to_cpu(a->lowest_vcn)) {
-			ntfs_log_debug("$MFT has corrupt attribute list attribute. "
-					"Run chkdsk.\n");
+			ntfs_log_error("$MFT has corrupt attribute list "
+					"attribute. Run chkdsk.\n");
 			goto io_error_exit;
 		}
 	}
 	if (!a) {
-		ntfs_log_debug("$MFT/$DATA attribute not found. $MFT is corrupt. Run "
-				"chkdsk.\n");
+		ntfs_log_error("$MFT/$DATA attribute not found. "
+				"$MFT is corrupt. Run chkdsk.\n");
 		goto io_error_exit;
 	}
 	if (highest_vcn && highest_vcn != last_vcn - 1) {
-		ntfs_log_debug("Failed to load the complete runlist for $MFT/$DATA. "
-				"Bug or corrupt $MFT. Run chkdsk.\n");
-		ntfs_log_debug("highest_vcn = 0x%llx, last_vcn - 1 = 0x%llx\n",
-				(long long)highest_vcn, (long long)last_vcn - 1);
+		ntfs_log_error("Failed to load the complete runlist for "
+				"$MFT/$DATA. Bug or corrupt $MFT. "
+				"Run chkdsk.\n highest_vcn = 0x%llx, "
+				"last_vcn - 1 = 0x%llx\n", (long long)
+				highest_vcn, (long long)last_vcn - 1);
 		goto io_error_exit;
 	}
 	/* Done with the $Mft mft record. */
@@ -319,6 +322,7 @@ error_exit:
 		ntfs_inode_close(vol->mft_ni);
 		vol->mft_ni = NULL;
 	}
+	ntfs_log_error("Failed.\n");
 	errno = eo;
 	return -1;
 }
@@ -345,7 +349,8 @@ static int ntfs_mftmirr_load(ntfs_volume
 		return -1;
 	}
 	/* Get an ntfs attribute for $MFTMirr/$DATA, too. */
-	vol->mftmirr_na = ntfs_attr_open(vol->mftmirr_ni, AT_DATA, AT_UNNAMED, 0);
+	vol->mftmirr_na = ntfs_attr_open(vol->mftmirr_ni, AT_DATA,
+			AT_UNNAMED, 0);
 	if (!vol->mftmirr_na) {
 		ntfs_log_perror("Failed to open $MFTMirr/$DATA");
 		goto error_exit;
@@ -1501,14 +1506,14 @@ int ntfs_volume_write_flags(ntfs_volume 
 	}
 	if (ntfs_attr_lookup(AT_VOLUME_INFORMATION, AT_UNNAMED, 0, 0, 0, NULL,
 			0, ctx)) {
-		ntfs_log_debug("Error: Attribute $VOLUME_INFORMATION was not found "
+		ntfs_log_error("Attribute $VOLUME_INFORMATION was not found "
 				"in $Volume!\n");
 		goto err_out;
 	}
 	a = ctx->attr;
 	/* Sanity check. */
 	if (a->non_resident) {
-		ntfs_log_debug("Error: Attribute $VOLUME_INFORMATION must be "
+		ntfs_log_error("Attribute $VOLUME_INFORMATION must be "
 				"resident (and it isn't)!\n");
 		errno = EIO;
 		goto err_out;
@@ -1520,7 +1525,7 @@ int ntfs_volume_write_flags(ntfs_volume 
 			le32_to_cpu(ctx->mrec->bytes_in_use) ||
 			le16_to_cpu(a->value_offset) +
 			le32_to_cpu(a->value_length) > le32_to_cpu(a->length)) {
-		ntfs_log_debug("Error: Attribute $VOLUME_INFORMATION in $Volume is "
+		ntfs_log_error("Attribute $VOLUME_INFORMATION in $Volume is "
 				"corrupt!\n");
 		errno = EIO;
 		goto err_out;
@@ -1536,6 +1541,7 @@ int ntfs_volume_write_flags(ntfs_volume 
 	ret = 0; /* success */
 err_out:
 	ntfs_attr_put_search_ctx(ctx);
+	ntfs_log_error("Failed.\n");
 	return ret;
 }
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs bootsect.c, 1.20, 1.21 volume.c, 1.75, 1.76

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv27649/libntfs

Modified Files:
	bootsect.c volume.c 
Log Message:
80 chars lines long fixes


Index: bootsect.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/bootsect.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- bootsect.c	3 Feb 2006 22:19:19 -0000	1.20
+++ bootsect.c	19 Nov 2006 20:19:18 -0000	1.21
@@ -56,7 +56,8 @@
  *
  * Return TRUE if @b contains a valid ntfs boot sector and FALSE if not.
  */
-BOOL ntfs_boot_sector_is_ntfs(NTFS_BOOT_SECTOR *b, const BOOL silent __attribute__((unused)))
+BOOL ntfs_boot_sector_is_ntfs(NTFS_BOOT_SECTOR *b,
+		const BOOL silent __attribute__((unused)))
 {
 	u32 i;
 
@@ -148,10 +149,10 @@ BOOL ntfs_boot_sector_is_ntfs(NTFS_BOOT_
 	ntfs_log_debug("OK\n");
 
 	if (b->end_of_sector_marker != cpu_to_le16(0xaa55))
-		ntfs_log_debug("Warning: Bootsector has invalid end of sector marker.\n");
+		ntfs_log_debug("Warning: Bootsector has invalid end of sector "
+				"marker.\n");
 
 	ntfs_log_debug("Bootsector check completed successfully.\n");
-
 	return TRUE;
 not_ntfs:
 	ntfs_log_debug("FAILED\n");
@@ -187,7 +188,8 @@ int ntfs_boot_sector_parse(ntfs_volume *
 	 * ntfs_boot_sector_is_ntfs but in this way we can just do this once.
 	 */
 	sectors_per_cluster = bs->bpb.sectors_per_cluster;
-	ntfs_log_debug("NumberOfSectors = %lli\n", sle64_to_cpu(bs->number_of_sectors));
+	ntfs_log_debug("NumberOfSectors = %lli\n",
+			sle64_to_cpu(bs->number_of_sectors));
 	ntfs_log_debug("SectorsPerCluster = 0x%x\n", sectors_per_cluster);
 	if (sectors_per_cluster & (sectors_per_cluster - 1)) {
 		ntfs_log_debug("Error: %s is not a valid NTFS partition! "
@@ -244,7 +246,8 @@ int ntfs_boot_sector_parse(ntfs_volume *
 		return -1;
 	}
 	vol->mft_record_size_bits = ffs(vol->mft_record_size) - 1;
-	ntfs_log_debug("MftRecordSize = 0x%x\n", (unsigned)vol->mft_record_size);
+	ntfs_log_debug("MftRecordSize = 0x%x\n",
+			(unsigned)vol->mft_record_size);
 	ntfs_log_debug("MftRecordSizeBits = %u\n", vol->mft_record_size_bits);
 	/* Same as above for INDX record. */
 	c = bs->clusters_per_index_record;
@@ -254,7 +257,8 @@ int ntfs_boot_sector_parse(ntfs_volume *
 	else
 		vol->indx_record_size = c << vol->cluster_size_bits;
 	vol->indx_record_size_bits = ffs(vol->indx_record_size) - 1;
-	ntfs_log_debug("INDXRecordSize = 0x%x\n", (unsigned)vol->indx_record_size);
+	ntfs_log_debug("INDXRecordSize = 0x%x\n",
+			(unsigned)vol->indx_record_size);
 	ntfs_log_debug("INDXRecordSizeBits = %u\n", vol->indx_record_size_bits);
 	/*
 	 * Work out the size of the MFT mirror in number of mft records. If the

Index: volume.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- volume.c	12 Nov 2006 22:46:50 -0000	1.75
+++ volume.c	19 Nov 2006 20:19:18 -0000	1.76
@@ -457,8 +457,8 @@ ntfs_volume *ntfs_volume_startup(struct 
 		if (br != -1)
 			errno = EINVAL;
 		if (!br)
-			ntfs_log_debug("Error: partition is smaller than bootsector "
-					"size. Weird!\n");
+			ntfs_log_debug("Error: partition is smaller than "
+					"bootsector size. Weird!\n");
 		else
 			ntfs_log_perror("Error reading bootsector");
 		goto error_exit;
@@ -528,7 +528,8 @@ ntfs_volume *ntfs_volume_startup(struct 
 				vol->cluster_size;
 	if (vol->mft_zone_start <= mft_lcn)
 		vol->mft_zone_start = 0;
-	ntfs_log_debug("mft_zone_start = 0x%llx\n", (long long)vol->mft_zone_start);
+	ntfs_log_debug("mft_zone_start = 0x%llx\n",
+			(long long)vol->mft_zone_start);
 
 	/*
 	 * Need to cap the mft zone on non-standard volumes so that it does

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs dir.c, 1.76, 1.77 unistr.c, 1.37, 1.38

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv24317/libntfs

Modified Files:
	dir.c unistr.c 
Log Message:
cleanups


Index: dir.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- dir.c	15 Nov 2006 23:15:17 -0000	1.76
+++ dir.c	17 Nov 2006 22:51:29 -0000	1.77
@@ -522,7 +522,7 @@ ntfs_inode *ntfs_pathname_to_inode(ntfs_
 
 	p = ascii;
 	/* Remove leading /'s. */
-	while (p && *p && *p == PATH_SEP)
+	while (p && *p == PATH_SEP)
 		p++;
 	while (p && *p) {
 		/* Find the end of the first token. */

Index: unistr.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/unistr.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- unistr.c	1 Nov 2006 13:30:40 -0000	1.37
+++ unistr.c	17 Nov 2006 22:51:29 -0000	1.38
@@ -727,7 +727,7 @@ ntfschar *ntfs_str2ucs(const char *s, in
 		ntfs_log_perror("Couldn't convert '%s' to Unicode", s);
 		return NULL;
 	}
-	if (*len > 0xff) {
+	if (*len > NTFS_MAX_NAME_LEN) {
 		free(ucs);
 		errno = ENAMETOOLONG;
 		return NULL;

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.95,1.96

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv22952/ntfsprogs

Modified Files:
	ntfsmount.c 
Log Message:
add support for read errors in free disk space calculation (szaka)


Index: ntfsmount.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- ntfsmount.c	17 Nov 2006 22:14:55 -0000	1.95
+++ ntfsmount.c	17 Nov 2006 22:35:21 -0000	1.96
@@ -151,13 +151,13 @@ static long ntfs_fuse_get_nr_free_mft_re
 		return ctx->free_mft;
 	buf = ntfs_malloc(vol->cluster_size);
 	if (!buf)
-		return -ENOMEM;
+		return -errno;
 	while (1) {
 		int i, j;
 
 		br = ntfs_attr_pread(vol->mftbmp_na, total,
 				vol->cluster_size, buf);
-		if (!br)
+		if (br <= 0)
 			break;
 		total += br;
 		for (i = 0; i < br; i++)
@@ -166,7 +166,7 @@ static long ntfs_fuse_get_nr_free_mft_re
 					nr_free++;
 	}
 	free(buf);
-	if (!total)
+	if (!total || br < 0)
 		return -errno;
 	ctx->free_mft = nr_free;
 	ctx->state &= ~(NF_FreeMFTOutdate);
@@ -183,13 +183,13 @@ static long ntfs_fuse_get_nr_free_cluste
 		return ctx->free_clusters;
 	buf = ntfs_malloc(vol->cluster_size);
 	if (!buf)
-		return -ENOMEM;
+		return -errno;
 	while (1) {
 		int i, j;
 
 		br = ntfs_attr_pread(vol->lcnbmp_na, total,
 				vol->cluster_size, buf);
-		if (!br)
+		if (br <= 0)
 			break;
 		total += br;
 		for (i = 0; i < br; i++)
@@ -198,7 +198,7 @@ static long ntfs_fuse_get_nr_free_cluste
 					nr_free++;
 	}
 	free(buf);
-	if (!total)
+	if (!total || br < 0)
 		return -errno;
 	ctx->free_clusters = nr_free;
 	ctx->state &= ~(NF_FreeClustersOutdate);

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.94,1.95

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv20451/ntfsprogs

Modified Files:
	ntfsmount.c 
Log Message:
use optarg instead of argv[optind - 1]


Index: ntfsmount.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- ntfsmount.c	15 Nov 2006 23:15:17 -0000	1.94
+++ ntfsmount.c	17 Nov 2006 22:14:55 -0000	1.95
@@ -1694,22 +1694,20 @@ static int parse_options(int argc, char 
 					break;
 				}
 				/* We don't want relative path in /etc/mtab. */
-				if (argv[optind - 1][0] != '/') {
-					if (!realpath(argv[optind - 1],
-							opts.device)) {
+				if (optarg[0] != '/') {
+					if (!realpath(optarg, opts.device)) {
 						ntfs_log_perror("Failed to "
 								"access %s",
-								argv[optind -
-								1]);
+								optarg);
 						free(opts.device);
 						opts.device = NULL;
 						err++;
 						break;
 					}
 				} else
-					strcpy(opts.device, argv[optind - 1]);
+					strcpy(opts.device, optarg);
 			} else if (!opts.mnt_point)
-				opts.mnt_point = argv[optind - 1];
+				opts.mnt_point = optarg;
 			else {
 				ntfs_log_error("You must specify exactly one "
 						"device and exactly one mount "
@@ -1719,7 +1717,7 @@ static int parse_options(int argc, char 
 			break;
 		case 'o':
 			if (!opts.options)
-				opts.options = argv[optind - 1];
+				opts.options = optarg;
 			else {
 				ntfs_log_error("You must specify exactly one "
 						"set of options.\n");
@@ -1737,8 +1735,7 @@ static int parse_options(int argc, char 
 			opts.verbose++;
 			break;
 		default:
-			ntfs_log_error("Unknown option '%s'.\n",
-					argv[optind - 1]);
+			ntfs_log_error("Unknown option '%s'.\n", optarg);
 			err++;
 			break;
 		}

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.416,1.417

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357:/tmp/cvs-serv6665

Modified Files:
	ChangeLog 
Log Message:
Treat filenames in POSIX namespace as case insensitive in case of case insensitive mounts.


Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -p -r1.416 -r1.417
--- ChangeLog	12 Nov 2006 22:46:50 -0000	1.416
+++ ChangeLog	15 Nov 2006 23:15:17 -0000	1.417
@@ -67,6 +67,8 @@ xx/xx/2006 - x.xx.x - .
 	- Rewrite ntfs_attr_add() algorithm to be faster and cleverer.  (Yura)
 	- Rename MS_{RDONLY,NOATIME} to NTFS_MNT_{RDONLY,NOATIME}. Introduce
 	  NTFS_MNT_CASE_SENSITIVE.  (Yura)
+	- Treat filenames in POSIX namespace as case insensitive in case of
+	  case insensitive mounts.  (Anton, Yura)
 
 21/06/2006 - 1.13.1 - Various fixes.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.93,1.94

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv6665/ntfsprogs

Modified Files:
	ntfsmount.c 
Log Message:
Treat filenames in POSIX namespace as case insensitive in case of case insensitive mounts.


Index: ntfsmount.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- ntfsmount.c	13 Nov 2006 17:01:53 -0000	1.93
+++ ntfsmount.c	15 Nov 2006 23:15:17 -0000	1.94
@@ -1411,8 +1411,8 @@ static int ntfs_fuse_mount(const char *d
 	ntfs_volume *vol;
 
 	vol = utils_mount_volume(device, ((ctx->ro) ? NTFS_MNT_RDONLY : 0) |
-			((ctx->noatime) ? NTFS_MNT_NOATIME : 0) |
-			NTFS_MNT_CASE_SENSITIVE, ctx->force);
+			((ctx->noatime) ? NTFS_MNT_NOATIME : 0) /*|
+			NTFS_MNT_CASE_SENSITIVE*/, ctx->force);
 	if (!vol) {
 		ntfs_log_error("Mount failed.\n");
 		return -1;

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs dir.c,1.75,1.76

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv6665/libntfs

Modified Files:
	dir.c 
Log Message:
Treat filenames in POSIX namespace as case insensitive in case of case insensitive mounts.


Index: dir.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- dir.c	12 Nov 2006 22:46:50 -0000	1.75
+++ dir.c	15 Nov 2006 23:15:17 -0000	1.76
@@ -186,28 +186,17 @@ found_it:
 		}
 		/*
 		 * For a case insensitive mount, we also perform a case
-		 * insensitive comparison (provided the file name is not in the
-		 * POSIX namespace). If the comparison matches, we cache the
-		 * mft reference in mref.
+		 * insensitive comparison. If the comparison matches, we cache
+		 * the mft reference in mref. Use first case insensitive match
+		 * in case if no name matches case sensitive, but several names
+		 * matches case insensitive.
 		 */
-		if (!NVolCaseSensitive(vol) &&
-				ie->key.file_name.file_name_type &&
+		if (!mref && !NVolCaseSensitive(vol) &&
 				ntfs_names_are_equal(uname, uname_len,
 				(ntfschar*)&ie->key.file_name.file_name,
 				ie->key.file_name.file_name_length,
-				IGNORE_CASE, vol->upcase, vol->upcase_len)) {
-			/* Only one case insensitive matching name allowed. */
-			if (mref) {
-				ntfs_log_error("Found already cached mft "
-						"reference in phase 1. Please "
-						"run chkdsk and if that doesn't"
-						" find any errors please report"
-						" you saw this message to %s\n",
-						NTFS_DEV_LIST);
-				goto put_err_out;
-			}
+				IGNORE_CASE, vol->upcase, vol->upcase_len))
 			mref = le64_to_cpu(ie->indexed_file);
-		}
 		/*
 		 * Not a perfect match, need to do full blown collation so we
 		 * know which way in the B+tree we have to go.
@@ -381,28 +370,17 @@ found_it2:
 		}
 		/*
 		 * For a case insensitive mount, we also perform a case
-		 * insensitive comparison (provided the file name is not in the
-		 * POSIX namespace). If the comparison matches, we cache the
-		 * mft reference in mref.
+		 * insensitive comparison. If the comparison matches, we cache
+		 * the mft reference in mref. Use first case insensitive match
+		 * in case if no name matches case sensitive, but several names
+		 * matches case insensitive.
 		 */
-		if (!NVolCaseSensitive(vol) &&
-				ie->key.file_name.file_name_type &&
+		if (!mref && !NVolCaseSensitive(vol) &&
 				ntfs_names_are_equal(uname, uname_len,
 				(ntfschar*)&ie->key.file_name.file_name,
 				ie->key.file_name.file_name_length,
-				IGNORE_CASE, vol->upcase, vol->upcase_len)) {
-			/* Only one case insensitive matching name allowed. */
-			if (mref) {
-				ntfs_log_error("Found already cached mft "
-						"reference in phase 2. Please "
-						"run chkdsk and if that doesn't"
-						" find any errors please report"
-						" you saw this message to %s\n",
-						NTFS_DEV_LIST);
-				goto close_err_out;
-			}
+				IGNORE_CASE, vol->upcase, vol->upcase_len))
 			mref = le64_to_cpu(ie->indexed_file);
-		}
 		/*
 		 * Not a perfect match, need to do full blown collation so we
 		 * know which way in the B+tree we have to go.
@@ -1524,8 +1502,7 @@ search:
 		if (dir_ni->mft_no == MREF_LE(fn->parent_directory) &&
 				ntfs_names_are_equal(fn->file_name,
 				fn->file_name_length, name,
-				name_len, (fn->file_name_type ==
-				FILE_NAME_POSIX || case_sensitive_match) ?
+				name_len, case_sensitive_match ?
 				CASE_SENSITIVE : IGNORE_CASE, ni->vol->upcase,
 				ni->vol->upcase_len)) {
 			if (fn->file_name_type == FILE_NAME_WIN32) {

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c, 1.92, 1.93 utils.c, 1.66, 1.67

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv4227/ntfsprogs

Modified Files:
	ntfsmount.c utils.c 
Log Message:
use nice error messages from ntfs-3g


Index: ntfsmount.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- ntfsmount.c	12 Nov 2006 22:46:50 -0000	1.92
+++ ntfsmount.c	13 Nov 2006 17:01:53 -0000	1.93
@@ -1697,7 +1697,10 @@ static int parse_options(int argc, char 
 				if (argv[optind - 1][0] != '/') {
 					if (!realpath(argv[optind - 1],
 							opts.device)) {
-						ntfs_log_perror("realpath");
+						ntfs_log_perror("Failed to "
+								"access %s",
+								argv[optind -
+								1]);
 						free(opts.device);
 						opts.device = NULL;
 						err++;

Index: utils.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- utils.c	26 Oct 2006 20:45:28 -0000	1.66
+++ utils.c	13 Nov 2006 17:01:53 -0000	1.67
@@ -81,6 +81,41 @@ const char *ntfs_gpl = "This program is 
 	"\"COPYING\" distributed with this program, or online at:\n"
 	"http://www.gnu.org/copyleft/gpl.html\n";
 
+static const char *invalid_ntfs_msg =
+"The device '%s' doesn't have a valid NTFS.\n"
+"Maybe you selected the wrong device? Or the whole disk instead of a\n"
+"partition (e.g. /dev/hda, not /dev/hda1)? Or the other way around?\n";
+
+static const char *corrupt_volume_msg =
+"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"
+"made to NTFS by this software.\n";
+
+static const char *hibernated_volume_msg =
+"The NTFS partition is hibernated. Please resume Windows and turned it \n"
+"off properly, so mounting could be done safely.\n";
+
+static const char *unclean_journal_msg =
+"Mount is denied because the NTFS journal file is unclean. Choices are:\n"
+" A) Shutdown Windows properly.\n"
+" B) Click the 'Safely Remove Hardware' icon in the Windows taskbar\n"
+"    notification area before disconnecting the device.\n"
+" C) Use 'Eject' from Windows Explorer to safely remove the device.\n"
+" D) If you ran chkdsk previously then boot Windows again which will\n"
+"    automatically initialize the journal.\n"
+" E) Run 'ntfsfix' on Linux which will reset the NTFS journal.\n"
+"    Then submit force option (WARNING: This solution it not recommended).\n"
+" F) ntfsmount: Mount the volume read-only by using the 'ro' mount option.\n";
+
+static const char *opened_volume_msg =
+"Mount is denied because the NTFS volume is already exclusively opened.\n"
+"The volume may be already mounted, or another software may use it which\n"
+"could be identified for example by the help of the 'fuser' command.\n";
+
+static const char *dirty_volume_msg =
+"Volume is scheduled for check.\n"
+"Please boot into Windows TWICE, or use the 'force' option.\n";
+
 /**
  * utils_set_locale
  */
@@ -91,7 +126,8 @@ int utils_set_locale(void)
 	locale = setlocale(LC_ALL, "");
 	if (!locale) {
 		locale = setlocale(LC_ALL, NULL);
-		ntfs_log_error("Failed to set locale, using default '%s'.\n", locale);
+		ntfs_log_error("Failed to set locale, using default '%s'.\n",
+				locale);
 		return 1;
 	} else {
 		return 0;
@@ -99,7 +135,7 @@ int utils_set_locale(void)
 }
 
 /**
- * utils_valid_device - Perform some safety checks on the device, before we start
+ * utils_valid_device - Perform some safety checks on the device, before start
  * @name:   Full pathname of the device/file to work with
  * @force:  Continue regardless of problems
  *
@@ -115,7 +151,7 @@ int utils_valid_device(const char *name,
 	struct stat st;
 
 #ifdef __CYGWIN32__
-	/* FIXME: This doesn't work for Cygwin, so just return success for now... */
+	/* FIXME: This doesn't work for Cygwin, so just return success. */
 	return 1;
 #endif
 	if (!name) {
@@ -124,37 +160,30 @@ int utils_valid_device(const char *name,
 	}
 
 	if (stat(name, &st) == -1) {
-		if (errno == ENOENT) {
+		if (errno == ENOENT)
 			ntfs_log_error("The device %s doesn't exist\n", name);
-		} else {
-			ntfs_log_perror("Error getting information about %s", name);
-		}
+		else
+			ntfs_log_perror("Error getting information about %s",
+					name);
 		return 0;
 	}
 
-	if (!S_ISBLK(st.st_mode) && !S_ISREG(st.st_mode)) {
-		ntfs_log_warning("%s is not a block device, "
-				 "nor regular file.\n", name);
-		if (!force) {
-			ntfs_log_error("Use the force option to work with other"
-				       " file types, for your own risk!\n");
-			return 0;
-		}
-		ntfs_log_warning("Forced to continue.\n");
-	}
-
 	/* Make sure the file system is not mounted. */
 	if (ntfs_check_if_mounted(name, &mnt_flags)) {
-		ntfs_log_perror("Failed to determine whether %s is mounted", name);
+		ntfs_log_perror("Failed to determine whether %s is mounted",
+				name);
 		if (!force) {
-			ntfs_log_error("Use the force option to ignore this error.\n");
+			ntfs_log_error("Use the force option to ignore this "
+					"error.\n");
 			return 0;
 		}
 		ntfs_log_warning("Forced to continue.\n");
 	} else if (mnt_flags & NTFS_MF_MOUNTED) {
-		ntfs_log_warning("The device %s, is mounted.\n", name);
 		if (!force) {
-			ntfs_log_error("Use the force option to work a mounted filesystem.\n");
+			ntfs_log_error("%s", opened_volume_msg);
+			ntfs_log_error("You can use force option to avoid this "
+					"check, but this is not recommended\n"
+					"and may lead to data corruption.\n");
 			return 0;
 		}
 		ntfs_log_warning("Forced to continue.\n");
@@ -166,7 +195,8 @@ int utils_valid_device(const char *name,
 /**
  * utils_mount_volume - Mount an NTFS volume
  */
-ntfs_volume * utils_mount_volume(const char *device, unsigned long flags, BOOL force)
+ntfs_volume * utils_mount_volume(const char *device, unsigned long flags,
+		BOOL force)
 {
 	ntfs_volume *vol;
 
@@ -180,32 +210,29 @@ ntfs_volume * utils_mount_volume(const c
 
 	vol = ntfs_mount(device, flags);
 	if (!vol) {
-		int err;
-
-		err = errno;
-		ntfs_log_perror("Couldn't mount device '%s'", device);
-		if (err == EPERM)
-			ntfs_log_error("Windows was hibernated.  Try to mount "
-					"volume in windows, shut down and try "
-					"again.\n");
-		if (err == EOPNOTSUPP)
-			ntfs_log_error("Windows did not shut down properly.  "
-					"Try to mount volume in windows, "
-					"shut down and try again.\n");
+		ntfs_log_perror("Failed to mount '%s'", device);
+		if (errno == EINVAL)
+			ntfs_log_error(invalid_ntfs_msg, device);
+		else if (errno == EIO)
+			ntfs_log_error("%s", corrupt_volume_msg);
+		else if (errno == EPERM)
+			ntfs_log_error("%s", hibernated_volume_msg);
+		else if (errno == EOPNOTSUPP)
+			ntfs_log_error("%s", unclean_journal_msg);
+		else if (errno == EBUSY)
+			ntfs_log_error("%s", opened_volume_msg);
 		return NULL;
 	}
 
 	if (vol->flags & VOLUME_IS_DIRTY) {
-		ntfs_log_warning("Volume is dirty.\n");
 		if (!force) {
-			ntfs_log_error("Run chkdsk and try again, or use the "
-					"force option.\n");
+			ntfs_log_error("%s", dirty_volume_msg);
 			ntfs_umount(vol, FALSE);
 			return NULL;
 		}
-		ntfs_log_warning("Forced to continue.\n");
+		ntfs_log_error("WARNING: Dirty volume mount was forced by the "
+				"'force' mount option.\n");
 	}
-
 	return vol;
 }
 

[Linux-NTFS-cvs] CVS: ntfsprogs configure.ac,1.112,1.113

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357:/tmp/cvs-serv28802

Modified Files:
	configure.ac 
Log Message:
Disable debug logging by default (seriously increase speed)


Index: configure.ac
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- configure.ac	5 Nov 2006 21:40:57 -0000	1.112
+++ configure.ac	13 Nov 2006 15:38:43 -0000	1.113
@@ -143,11 +143,12 @@ AH_TEMPLATE([NTFS_DISABLE_DEBUG_LOGGING]
 	    [Define this if you want to compile out the debug log messages.
 	     This will reduce the size of the binaries.])
 AC_ARG_ENABLE(debug-logging,
-	AS_HELP_STRING(--disable-debug-logging,Remove debug logging from the code),
-	if test "$enable_debug_logging" == "no"; then
-		AC_DEFINE(NTFS_DISABLE_DEBUG_LOGGING)
-	fi,
+	AS_HELP_STRING(--enable-debug-logging,Add debug logging to the code),,
+	enable_debug_logging=no
 )
+if test "$enable_debug_logging" == "no"; then
+	AC_DEFINE(NTFS_DISABLE_DEBUG_LOGGING)
+fi
 
 # Use GNU extensions if available.
 AC_GNU_SOURCE

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfscat.c, 1.27, 1.28 ntfsclone.c, 1.93, 1.94 ntfscluster.c, 1.33, 1.34 ntfscmp.c, 1.20, 1.21 ntfscp.c, 1.38, 1.39 ntfsdecrypt.c, 1.31, 1.32 ntfsdump_logfile.c, 1.34, 1.35 ntfsinfo.c, 1.152, 1.153 ntfslabel.c, 1.21, 1.22 ntfsls.c, 1.37, 1.38 ntfsmftalloc.c, 1.10, 1.11 ntfsmount.c, 1.91, 1.92 ntfsmove.c, 1.23, 1.24 ntfsresize.c, 1.122, 1.123 ntfsrm.c, 1.72, 1.73 ntfstruncate.c, 1.33, 1.34 ntfsundelete.c, 1.56, 1.57 ntfswipe.c, 1.44, 1.45

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv12327/ntfsprogs

Modified Files:
	ntfscat.c ntfsclone.c ntfscluster.c ntfscmp.c ntfscp.c 
	ntfsdecrypt.c ntfsdump_logfile.c ntfsinfo.c ntfslabel.c 
	ntfsls.c ntfsmftalloc.c ntfsmount.c ntfsmove.c ntfsresize.c 
	ntfsrm.c ntfstruncate.c ntfsundelete.c ntfswipe.c 
Log Message:

* Rename MS_{RDONLY,NOATIME} to NTFS_MNT_{RDONLY,NOATIME}.
* Introduce NTFS_MNT_CASE_SENSITIVE.


Index: ntfscat.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfscat.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ntfscat.c	5 Apr 2006 12:43:07 -0000	1.27
+++ ntfscat.c	12 Nov 2006 22:46:50 -0000	1.28
@@ -399,7 +399,7 @@ int main(int argc, char *argv[])
 
 	utils_set_locale();
 
-	vol = utils_mount_volume(opts.device, MS_RDONLY, opts.force);
+	vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force);
 	if (!vol) {
 		ntfs_log_perror("ERROR: couldn't mount volume");
 		return 1;

Index: ntfsclone.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- ntfsclone.c	28 Oct 2006 23:41:41 -0000	1.93
+++ ntfsclone.c	12 Nov 2006 22:46:50 -0000	1.94
@@ -1593,7 +1593,7 @@ static s64 open_volume(void)
 {
 	s64 device_size;
 
-	mount_volume(MS_RDONLY);
+	mount_volume(NTFS_MNT_RDONLY);
 
 	device_size = ntfs_device_size_get(vol->dev, 1);
 	if (device_size <= 0)
@@ -1825,7 +1825,7 @@ int main(int argc, char **argv)
 	/* 'force' again mount for dirty volumes (e.g. after resize).
 	   FIXME: use mount flags to avoid potential side-effects in future */
 	opt.force++;
-	mount_volume(MS_NOATIME);
+	mount_volume(NTFS_MNT_NOATIME);
 
 	free(lcn_bitmap.bm);
 	setup_lcn_bitmap();

Index: ntfscluster.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfscluster.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- ntfscluster.c	5 Apr 2006 12:43:07 -0000	1.33
+++ ntfscluster.c	12 Nov 2006 22:46:50 -0000	1.34
@@ -492,7 +492,7 @@ int main(int argc, char *argv[])
 
 	utils_set_locale();
 
-	vol = utils_mount_volume(opts.device, MS_RDONLY, opts.force);
+	vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force);
 	if (!vol)
 		return 1;
 

Index: ntfscmp.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfscmp.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ntfscmp.c	27 Oct 2006 12:24:30 -0000	1.20
+++ ntfscmp.c	12 Nov 2006 22:46:50 -0000	1.21
@@ -939,7 +939,7 @@ static ntfs_volume *mount_volume(const c
 				 "You must 'umount' it first.\n", volume);
 	}
 
-	vol = ntfs_mount(volume, MS_RDONLY);
+	vol = ntfs_mount(volume, NTFS_MNT_RDONLY);
 	if (vol == NULL) {
 
 		int err = errno;

Index: ntfscp.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- ntfscp.c	4 Oct 2006 00:47:04 -0000	1.38
+++ ntfscp.c	12 Nov 2006 22:46:50 -0000	1.39
@@ -344,7 +344,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (opts.noaction)
-		flags = MS_RDONLY;
+		flags = NTFS_MNT_RDONLY;
 
 	vol = utils_mount_volume(opts.device, flags, opts.force);
 	if (!vol) {

Index: ntfsdecrypt.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdecrypt.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- ntfsdecrypt.c	25 Sep 2006 16:58:38 -0000	1.31
+++ ntfsdecrypt.c	12 Nov 2006 22:46:50 -0000	1.32
@@ -1315,7 +1315,7 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 	/* Mount the ntfs volume. */
-	vol = utils_mount_volume(opts.device, MS_RDONLY, opts.force);
+	vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force);
 	if (!vol) {
 		ntfs_log_error("Failed to mount ntfs volume.  Aborting.\n");
 		ntfs_rsa_private_key_release(rsa_key);

Index: ntfsdump_logfile.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdump_logfile.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- ntfsdump_logfile.c	20 Nov 2005 14:15:33 -0000	1.34
+++ ntfsdump_logfile.c	12 Nov 2006 22:46:50 -0000	1.35
@@ -197,7 +197,7 @@ static int logfile_open(BOOL is_volume, 
 		ntfs_inode *ni;
 		ntfs_attr *na;
 
-		vol = ntfs_mount(filename, MS_RDONLY);
+		vol = ntfs_mount(filename, NTFS_MNT_RDONLY);
 		if (!vol)
 			log_err_exit(NULL, "Failed to mount %s: %s\n",
 					filename, strerror(errno));

Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- ntfsinfo.c	5 Nov 2006 14:42:46 -0000	1.152
+++ ntfsinfo.c	12 Nov 2006 22:46:50 -0000	1.153
@@ -2204,7 +2204,7 @@ int main(int argc, char **argv)
 
 	utils_set_locale();
 
-	vol = utils_mount_volume(opts.device, MS_RDONLY, opts.force);
+	vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force);
 	if (!vol) {
 		printf("Failed to open '%s': %s\n", opts.device,
 				strerror(errno));

Index: ntfslabel.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfslabel.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ntfslabel.c	5 Apr 2006 12:43:07 -0000	1.21
+++ ntfslabel.c	12 Nov 2006 22:46:50 -0000	1.22
@@ -394,8 +394,8 @@ int main(int argc, char **argv)
 	if (!opts.label)
 		opts.noaction++;
 
-	vol = utils_mount_volume(opts.device, opts.noaction ? MS_RDONLY : 0,
-			opts.force);
+	vol = utils_mount_volume(opts.device, opts.noaction ?
+			NTFS_MNT_RDONLY : 0, opts.force);
 	if (!vol)
 		return 1;
 

Index: ntfsls.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsls.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- ntfsls.c	5 Apr 2006 12:43:07 -0000	1.37
+++ ntfsls.c	12 Nov 2006 22:46:50 -0000	1.38
@@ -651,7 +651,7 @@ int main(int argc, char **argv)
 
 	utils_set_locale();
 
-	vol = utils_mount_volume(opts.device, MS_RDONLY, opts.force);
+	vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force);
 	if (!vol) {
 		// FIXME: Print error... (AIA)
 		return 2;

Index: ntfsmftalloc.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmftalloc.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ntfsmftalloc.c	20 Nov 2005 14:15:33 -0000	1.10
+++ ntfsmftalloc.c	12 Nov 2006 22:46:50 -0000	1.11
@@ -313,7 +313,7 @@ int main(int argc, char **argv)
 	/* Mount the device. */
 	if (opts.no_action) {
 		ntfs_log_quiet("Running in READ-ONLY mode!\n");
-		ul = MS_RDONLY;
+		ul = NTFS_MNT_RDONLY;
 	} else
 		ul = 0;
 	vol = ntfs_mount(dev_name, ul);

Index: ntfsmount.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- ntfsmount.c	10 Nov 2006 17:23:12 -0000	1.91
+++ ntfsmount.c	12 Nov 2006 22:46:50 -0000	1.92
@@ -1410,8 +1410,9 @@ static int ntfs_fuse_mount(const char *d
 {
 	ntfs_volume *vol;
 
-	vol = utils_mount_volume(device, ((ctx->ro) ? MS_RDONLY : 0) |
-			((ctx->noatime) ? MS_NOATIME : 0), ctx->force);
+	vol = utils_mount_volume(device, ((ctx->ro) ? NTFS_MNT_RDONLY : 0) |
+			((ctx->noatime) ? NTFS_MNT_NOATIME : 0) |
+			NTFS_MNT_CASE_SENSITIVE, ctx->force);
 	if (!vol) {
 		ntfs_log_error("Mount failed.\n");
 		return -1;

Index: ntfsmove.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmove.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ntfsmove.c	25 Sep 2006 16:58:38 -0000	1.23
+++ ntfsmove.c	12 Nov 2006 22:46:50 -0000	1.24
@@ -875,7 +875,7 @@ int main(int argc, char *argv[])
 	utils_set_locale();
 
 	if (opts.noaction)
-		flags |= MS_RDONLY;
+		flags |= NTFS_MNT_RDONLY;
 
 	vol = utils_mount_volume(opts.device, flags, opts.force);
 	if (!vol) {

Index: ntfsresize.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- ntfsresize.c	27 Oct 2006 12:24:30 -0000	1.122
+++ ntfsresize.c	12 Nov 2006 22:46:50 -0000	1.123
@@ -484,7 +484,7 @@ static int parse_options(int argc, char 
 			opt.info++;
 			break;
 		case 'n':
-			opt.ro_flag = MS_RDONLY;
+			opt.ro_flag = NTFS_MNT_RDONLY;
 			break;
 		case 'P':
 			opt.show_progress = 0;
@@ -520,7 +520,7 @@ static int parse_options(int argc, char 
 			err++;
 		}
 		if (opt.info) {
-			opt.ro_flag = MS_RDONLY;
+			opt.ro_flag = NTFS_MNT_RDONLY;
 			if (opt.bytes) {
 				printf(NERR_PREFIX "Options --info and --size "
 					"can't be used together.\n");
@@ -2237,7 +2237,7 @@ static ntfs_volume *mount_volume(void)
 				 "You must 'umount' it first.\n", opt.volume);
 	}
 
-	if (!(vol = ntfs_mount(opt.volume, opt.ro_flag | MS_NOATIME))) {
+	if (!(vol = ntfs_mount(opt.volume, opt.ro_flag | NTFS_MNT_NOATIME))) {
 
 		int err = errno;
 

Index: ntfsrm.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- ntfsrm.c	5 Apr 2006 12:43:08 -0000	1.72
+++ ntfsrm.c	12 Nov 2006 22:46:50 -0000	1.73
@@ -1027,7 +1027,7 @@ int main(int argc, char *argv[])
 #endif
 
 	if (opts.noaction)
-		flags |= MS_RDONLY;
+		flags |= NTFS_MNT_RDONLY;
 
 	//ntfs_log_set_levels (NTFS_LOG_LEVEL_DEBUG | NTFS_LOG_LEVEL_TRACE);
 	//ntfs_log_set_levels (NTFS_LOG_LEVEL_DEBUG);

Index: ntfstruncate.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfstruncate.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- ntfstruncate.c	5 Apr 2006 02:45:56 -0000	1.33
+++ ntfstruncate.c	12 Nov 2006 22:46:50 -0000	1.34
@@ -738,7 +738,7 @@ int main(int argc, char **argv)
 	/* Mount the device. */
 	if (opts.no_action) {
 		ntfs_log_quiet("Running in READ-ONLY mode!\n");
-		ul = MS_RDONLY;
+		ul = NTFS_MNT_RDONLY;
 	} else
 		ul = 0;
 	vol = ntfs_mount(dev_name, ul);

Index: ntfsundelete.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsundelete.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- ntfsundelete.c	5 Apr 2006 12:43:08 -0000	1.56
+++ ntfsundelete.c	12 Nov 2006 22:46:51 -0000	1.57
@@ -2123,7 +2123,7 @@ int main(int argc, char *argv[])
 
 	utils_set_locale();
 
-	vol = utils_mount_volume(opts.device, MS_RDONLY, opts.force);
+	vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force);
 	if (!vol)
 		return 1;
 

Index: ntfswipe.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfswipe.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- ntfswipe.c	5 Apr 2006 12:43:08 -0000	1.44
+++ ntfswipe.c	12 Nov 2006 22:46:51 -0000	1.45
@@ -1340,7 +1340,7 @@ int main(int argc, char *argv[])
 		print_summary();
 
 	if (opts.info || opts.noaction)
-		flags = MS_RDONLY;
+		flags = NTFS_MNT_RDONLY;
 
 	vol = utils_mount_volume(opts.device, flags, opts.force);
 	if (!vol)

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs dir.c, 1.74, 1.75 gnome-vfs-method.c, 1.8, 1.9 volume.c, 1.74, 1.75

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv12327/libntfs

Modified Files:
	dir.c gnome-vfs-method.c volume.c 
Log Message:

* Rename MS_{RDONLY,NOATIME} to NTFS_MNT_{RDONLY,NOATIME}.
* Introduce NTFS_MNT_CASE_SENSITIVE.


Index: dir.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- dir.c	1 Nov 2006 22:37:31 -0000	1.74
+++ dir.c	12 Nov 2006 22:46:50 -0000	1.75
@@ -126,10 +126,11 @@ u64 ntfs_inode_lookup_by_name(ntfs_inode
 		return -1;
 
 	/* Find the index root attribute in the mft record. */
-	if (ntfs_attr_lookup(AT_INDEX_ROOT, NTFS_INDEX_I30, 4, CASE_SENSITIVE, 0, NULL,
-			0, ctx)) {
-		ntfs_log_perror("Index root attribute missing in directory inode "
-				"0x%llx", (unsigned long long)dir_ni->mft_no);
+	if (ntfs_attr_lookup(AT_INDEX_ROOT, NTFS_INDEX_I30, 4, CASE_SENSITIVE,
+				0, NULL, 0, ctx)) {
+		ntfs_log_perror("Index root attribute missing in directory "
+				"inode 0x%llx", (unsigned long long)dir_ni->
+				mft_no);
 		goto put_err_out;
 	}
 	/* Get to the index root value. */
@@ -263,9 +264,9 @@ found_it:
 	/* Open the index allocation attribute. */
 	ia_na = ntfs_attr_open(dir_ni, AT_INDEX_ALLOCATION, NTFS_INDEX_I30, 4);
 	if (!ia_na) {
-		ntfs_log_perror("Failed to open index allocation attribute. Directory "
-				"inode 0x%llx is corrupt or driver bug",
-				(unsigned long long)dir_ni->mft_no);
+		ntfs_log_perror("Failed to open index allocation attribute. "
+				"Directory inode 0x%llx is corrupt or driver "
+				"bug", (unsigned long long)dir_ni->mft_no);
 		goto put_err_out;
 	}
 
@@ -302,28 +303,30 @@ descend_into_child_node:
 	}
 
 	if (sle64_to_cpu(ia->index_block_vcn) != vcn) {
-		ntfs_log_debug("Actual VCN (0x%llx) of index buffer is different "
-				"from expected VCN (0x%llx).\n",
+		ntfs_log_debug("Actual VCN (0x%llx) of index buffer is "
+				"different from expected VCN (0x%llx).\n",
 				(long long)sle64_to_cpu(ia->index_block_vcn),
 				(long long)vcn);
 		errno = EIO;
 		goto close_err_out;
 	}
 	if (le32_to_cpu(ia->index.allocated_size) + 0x18 != index_block_size) {
-		ntfs_log_debug("Index buffer (VCN 0x%llx) of directory inode 0x%llx "
-				"has a size (%u) differing from the directory "
-				"specified size (%u).\n", (long long)vcn,
-				(unsigned long long)dir_ni->mft_no,
-				(unsigned) le32_to_cpu(ia->index.allocated_size) + 0x18,
-				(unsigned)index_block_size);
+		ntfs_log_debug("Index buffer (VCN 0x%llx) of directory inode "
+				"0x%llx has a size (%u) differing from the "
+				"directory specified size (%u).\n",
+				(long long)vcn, (unsigned long long)dir_ni->
+				mft_no, (unsigned)le32_to_cpu(ia->index.
+				allocated_size) + 0x18, (unsigned)
+				index_block_size);
 		errno = EIO;
 		goto close_err_out;
 	}
 	index_end = (u8*)&ia->index + le32_to_cpu(ia->index.index_length);
 	if (index_end > (u8*)ia + index_block_size) {
-		ntfs_log_debug("Size of index buffer (VCN 0x%llx) of directory inode "
-				"0x%llx exceeds maximum size.\n",
-				(long long)vcn, (unsigned long long)dir_ni->mft_no);
+		ntfs_log_debug("Size of index buffer (VCN 0x%llx) of directory "
+				"inode 0x%llx exceeds maximum size.\n",
+				(long long)vcn, (unsigned long long)dir_ni->
+				mft_no);
 		errno = EIO;
 		goto close_err_out;
 	}
@@ -444,8 +447,9 @@ found_it2:
 	 */
 	if (ie->flags & INDEX_ENTRY_NODE) {
 		if ((ia->index.flags & NODE_MASK) == LEAF_NODE) {
-			ntfs_log_debug("Index entry with child node found in a leaf "
-					"node in directory inode 0x%llx.\n",
+			ntfs_log_debug("Index entry with child node found in a "
+					"leaf node in directory inode "
+					"0x%llx.\n",
 					(unsigned long long)dir_ni->mft_no);
 			errno = EIO;
 			goto close_err_out;
@@ -455,7 +459,8 @@ found_it2:
 		if (vcn >= 0)
 			goto descend_into_child_node;
 		ntfs_log_debug("Negative child node vcn in directory inode "
-				"0x%llx.\n", (unsigned long long)dir_ni->mft_no);
+				"0x%llx.\n", (unsigned long long)dir_ni->
+				mft_no);
 		errno = EIO;
 		goto close_err_out;
 	}
@@ -700,8 +705,9 @@ static MFT_REF ntfs_mft_get_parent_ref(n
 		goto err_out;
 	}
 	if (ctx->attr->non_resident) {
-		ntfs_log_debug("File name attribute must be resident. Corrupt inode "
-				"0x%llx.\n", (unsigned long long)ni->mft_no);
+		ntfs_log_debug("File name attribute must be resident. "
+				"Corrupt inode 0x%llx.\n",
+				(unsigned long long)ni->mft_no);
 		goto io_err_out;
 	}
 	fn = (FILE_NAME_ATTR*)((u8*)ctx->attr +
@@ -824,10 +830,11 @@ int ntfs_readdir(ntfs_inode *dir_ni, s64
 	/* Get the offset into the index root attribute. */
 	ir_pos = (int)*pos;
 	/* Find the index root attribute in the mft record. */
-	if (ntfs_attr_lookup(AT_INDEX_ROOT, NTFS_INDEX_I30, 4, CASE_SENSITIVE, 0, NULL,
-			0, ctx)) {
-		ntfs_log_debug("Index root attribute missing in directory inode "
-				"0x%llx.\n", (unsigned long long)dir_ni->mft_no);
+	if (ntfs_attr_lookup(AT_INDEX_ROOT, NTFS_INDEX_I30, 4, CASE_SENSITIVE,
+				0, NULL, 0, ctx)) {
+		ntfs_log_debug("Index root attribute missing in directory "
+				"inode 0x%llx.\n", (unsigned long long)dir_ni->
+				mft_no);
 		goto dir_err_out;
 	}
 	/* Get to the index root value. */
@@ -868,7 +875,8 @@ int ntfs_readdir(ntfs_inode *dir_ni, s64
 	 * or signals an error (both covered by the rc test).
 	 */
 	for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->length))) {
-		ntfs_log_debug("In index root, offset 0x%x.\n", (u8*)ie - (u8*)ir);
+		ntfs_log_debug("In index root, offset 0x%x.\n",
+				(u8*)ie - (u8*)ir);
 		/* Bounds checks. */
 		if ((u8*)ie < (u8*)ctx->mrec || (u8*)ie +
 				sizeof(INDEX_ENTRY_HEADER) > index_end ||
@@ -965,7 +973,8 @@ find_next_index_buffer:
 		if (br != bmp_buf_size) {
 			if (br != -1)
 				errno = EIO;
-			ntfs_log_perror("Failed to read from index bitmap attribute");
+			ntfs_log_perror("Failed to read from index bitmap "
+					"attribute");
 			goto err_out;
 		}
 	}
@@ -985,18 +994,19 @@ find_next_index_buffer:
 	ia_start = ia_pos & ~(s64)(index_block_size - 1);
 	if (sle64_to_cpu(ia->index_block_vcn) != ia_start >>
 			index_vcn_size_bits) {
-		ntfs_log_debug("Actual VCN (0x%llx) of index buffer is different "
-				"from expected VCN (0x%llx) in inode 0x%llx.\n",
+		ntfs_log_debug("Actual VCN (0x%llx) of index buffer is "
+				"different from expected VCN (0x%llx) in "
+				"inode 0x%llx.\n",
 				(long long)sle64_to_cpu(ia->index_block_vcn),
 				(long long)ia_start >> index_vcn_size_bits,
 				(unsigned long long)dir_ni->mft_no);
 		goto dir_err_out;
 	}
 	if (le32_to_cpu(ia->index.allocated_size) + 0x18 != index_block_size) {
-		ntfs_log_debug("Index buffer (VCN 0x%llx) of directory inode 0x%llx "
-				"has a size (%u) differing from the directory "
-				"specified size (%u).\n", (long long)ia_start >>
-				index_vcn_size_bits,
+		ntfs_log_debug("Index buffer (VCN 0x%llx) of directory inode "
+				"0x%llx has a size (%u) differing from the "
+				"directory specified size (%u).\n",
+				(long long)ia_start >> index_vcn_size_bits,
 				(unsigned long long)dir_ni->mft_no,
 				(unsigned) le32_to_cpu(ia->index.allocated_size)
 				+ 0x18, (unsigned)index_block_size);
@@ -1004,8 +1014,8 @@ find_next_index_buffer:
 	}
 	index_end = (u8*)&ia->index + le32_to_cpu(ia->index.index_length);
 	if (index_end > (u8*)ia + index_block_size) {
-		ntfs_log_debug("Size of index buffer (VCN 0x%llx) of directory inode "
-				"0x%llx exceeds maximum size.\n",
+		ntfs_log_debug("Size of index buffer (VCN 0x%llx) of directory "
+				"inode 0x%llx exceeds maximum size.\n",
 				(long long)ia_start >> index_vcn_size_bits,
 				(unsigned long long)dir_ni->mft_no);
 		goto dir_err_out;
@@ -1026,8 +1036,9 @@ find_next_index_buffer:
 				sizeof(INDEX_ENTRY_HEADER) > index_end ||
 				(u8*)ie + le16_to_cpu(ie->key_length) >
 				index_end) {
-			ntfs_log_debug("Index entry out of bounds in directory inode "
-				"0x%llx.\n", (unsigned long long)dir_ni->mft_no);
+			ntfs_log_debug("Index entry out of bounds in directory "
+					"inode 0x%llx.\n", (unsigned long long)
+					dir_ni->mft_no);
 			goto dir_err_out;
 		}
 		/* The last entry cannot contain a name. */
@@ -1058,10 +1069,11 @@ done:
 		ntfs_attr_close(ia_na);
 #ifdef DEBUG
 	if (!rc)
-		ntfs_log_debug("EOD, *pos 0x%llx, returning 0.\n", (long long)*pos);
+		ntfs_log_debug("EOD, *pos 0x%llx, returning 0.\n",
+				(long long)*pos);
 	else
-		ntfs_log_debug("filldir returned %i, *pos 0x%llx, returning 0.\n",
-				rc, (long long)*pos);
+		ntfs_log_debug("filldir returned %i, *pos 0x%llx, "
+				"returning 0.\n", rc, (long long)*pos);
 #endif
 	return 0;
 dir_err_out:
@@ -1483,8 +1495,8 @@ int ntfs_delete(ntfs_inode *ni, ntfs_ino
 	 * WIN32_AND_DOS namespace, then simply remove it from index and inode.
 	 * If filename in DOS or in WIN32 namespace, then remove DOS name first,
 	 * only then remove WIN32 name. Mark WIN32 name as POSIX name to prevent
-	 * chkdsk to complain about DOS name absentation, in case if DOS name
-	 * had been successfully deleted, but WIN32 name removing failed.
+	 * chkdsk to complain about DOS name absence in case if DOS name had
+	 * been successfully deleted, but WIN32 name remove failed.
 	 */
 	actx = ntfs_attr_get_search_ctx(ni, NULL);
 	if (!actx)
@@ -1530,10 +1542,11 @@ search:
 	}
 	if (errno) {
 		/*
-		 * If case sensitive search failed, then try once again
-		 * ignoring case.
+		 * If case sensitive search failed and volume mounted case
+		 * insensitive, then try once again ignoring case.
 		 */
-		if (errno == ENOENT && case_sensitive_match) {
+		if (errno == ENOENT && !NVolCaseSensitive(ni->vol) &&
+				case_sensitive_match) {
 			case_sensitive_match = FALSE;
 			ntfs_attr_reinit_search_ctx(actx);
 			ntfs_log_trace("Restart search. Ignore case.");
@@ -1556,7 +1569,7 @@ search:
 		/*
 		 * Do not allow non-empty directory deletion if hard links count
 		 * is 1 (always) or 2 (in case if filename in DOS namespace,
-		 * because we delete it first in filen which have both WIN32 and
+		 * because we delete it first in file which have both WIN32 and
 		 * DOS names).
 		 */
 		if ((na->data_size != sizeof(INDEX_ROOT) + sizeof(
@@ -1598,7 +1611,7 @@ search:
 	/* Remove FILE_NAME from inode. */
 	if (ntfs_attr_record_rm(actx))
 		goto err_out;
-	/* Decerement hard link count. */
+	/* Decrement hard link count. */
 	ni->mrec->link_count = cpu_to_le16(le16_to_cpu(
 			ni->mrec->link_count) - 1);
 	ntfs_inode_mark_dirty(ni);
@@ -1611,7 +1624,7 @@ search:
 		goto search;
 	} else
 		ntfs_log_trace("Deleted.\n");
-	/* TODO: Update object id, quota and securiry indexes if required. */
+	/* TODO: Update object id, quota and security 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
@@ -1687,8 +1700,8 @@ err_out:
  * @name:	unicode name of the new link
  * @name_len:	length of the name in unicode characters
  *
- * NOTE: At present we allow creating hardlinks to directories, we use them
- * in a temporary state during rename. But it's defenitely bad idea to have
+ * NOTE: At present we allow creating hard links to directories, we use them
+ * in a temporary state during rename. But it's definitely bad idea to have
  * hard links to directories as a result of operation.
  * FIXME: Create internal  __ntfs_link that allows hard links to a directories
  * and external ntfs_link that do not. Write ntfs_rename that uses __ntfs_link.
@@ -1705,7 +1718,7 @@ int ntfs_link(ntfs_inode *ni, ntfs_inode
 	if (!ni || !dir_ni || !name || !name_len ||
 			ni->mft_no == dir_ni->mft_no) {
 		err = EINVAL;
-		ntfs_log_perror("ntfs_link wrong arguments");
+		ntfs_log_error("Invalid arguments.");
 		goto err_out;
 	}
 	/* Create FILE_NAME attribute. */

Index: gnome-vfs-method.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/gnome-vfs-method.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gnome-vfs-method.c	3 Feb 2006 22:19:19 -0000	1.8
+++ gnome-vfs-method.c	12 Nov 2006 22:46:50 -0000	1.9
@@ -162,7 +162,8 @@ static GnomeVFSResult libntfs_gnomevfs_u
 			return GNOME_VFS_ERROR_INVALID_URI;
 		}
 
-		if (!(volume = ntfs_mount(uri->parent->text, MS_RDONLY))) {
+		if (!(volume = ntfs_mount(uri->parent->text,
+				NTFS_MNT_RDONLY))) {
 			g_free(uri_parent_string);
 			return GNOME_VFS_ERROR_WRONG_FORMAT;
 		}

Index: volume.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- volume.c	1 Nov 2006 13:30:40 -0000	1.74
+++ volume.c	12 Nov 2006 22:46:50 -0000	1.75
@@ -117,7 +117,7 @@ static void __ntfs_volume_release(ntfs_v
 		if (NDevDirty(dev))
 			dev->d_ops->sync(dev);
 		if (dev->d_ops->close(dev))
-			ntfs_log_perror("Eeek! Failed to close the device.  Error: ");
+			ntfs_log_perror("Failed to close the device.  Error: ");
 	}
 	free(v->vol_name);
 	free(v->upcase);
@@ -399,7 +399,8 @@ error_exit:
  * Return the allocated volume structure on success and NULL on error with
  * errno set to the error code.
  */
-ntfs_volume *ntfs_volume_startup(struct ntfs_device *dev, unsigned long flags)
+ntfs_volume *ntfs_volume_startup(struct ntfs_device *dev,
+		ntfs_mount_flags flags)
 {
 	LCN mft_zone_size, mft_lcn;
 	s64 br;
@@ -435,10 +436,12 @@ ntfs_volume *ntfs_volume_startup(struct 
 
 	ntfs_upcase_table_build(vol->upcase,
 			vol->upcase_len * sizeof(ntfschar));
-	if (flags & MS_RDONLY)
+	if (flags & NTFS_MNT_RDONLY)
 		NVolSetReadOnly(vol);
-	if (flags & MS_NOATIME)
+	if (flags & NTFS_MNT_NOATIME)
 		NVolSetNoATime(vol);
+	if (flags & NTFS_MNT_CASE_SENSITIVE)
+		NVolSetCaseSensitive(vol);
 	ntfs_log_debug("Reading bootsector... ");
 	if (dev->d_ops->open(dev, NVolReadOnly(vol) ? O_RDONLY: O_RDWR)) {
 		ntfs_log_debug(FAILED);
@@ -746,11 +749,13 @@ out:
  * This function mounts an ntfs volume. @dev should describe the device which
  * to mount as the ntfs volume.
  *
- * @flags is an optional second parameter. The same flags are used as for
- * the mount system call (man 2 mount). Currently only the following flags
+ * @flags is an optional second parameter. Some flags are similar to flags used
+ * as for the mount system call (man 2 mount). Currently the following flags
  * are implemented:
- *	MS_RDONLY	- mount volume read-only
- *	MS_NOATIME	- do not update access time
+ *	NTFS_MNT_RDONLY		- mount volume read-only
+ *	NTFS_MNT_NOATIME	- do not update access time
+ *	NTFS_MNT_CASE_SENSITIVE - treat filenames as case sensitive even if
+ *				  they are not in POSIX namespace
  *
  * The function opens the device @dev and verifies that it contains a valid
  * bootsector. Then, it allocates an ntfs_volume structure and initializes
@@ -761,7 +766,7 @@ out:
  * Return the allocated volume structure on success and NULL on error with
  * errno set to the error code.
  */
-ntfs_volume *ntfs_device_mount(struct ntfs_device *dev, unsigned long flags)
+ntfs_volume *ntfs_device_mount(struct ntfs_device *dev, ntfs_mount_flags flags)
 {
 	s64 l;
 #ifndef NTFS_DISABLE_DEBUG_LOGGING
@@ -936,8 +941,8 @@ ntfs_volume *ntfs_device_mount(struct nt
 	l = ntfs_attr_pread(na, 0, na->data_size, vol->upcase);
 	if (l != na->data_size) {
 		ntfs_log_debug(FAILED);
-		ntfs_log_debug("Amount of data read does not correspond to expected "
-				"length!\n");
+		ntfs_log_debug("Amount of data read does not correspond to "
+				"expected length!\n");
 		errno = EIO;
 		goto error_exit;
 	}
@@ -990,8 +995,8 @@ ntfs_volume *ntfs_device_mount(struct nt
 			le16_to_cpu(a->value_offset) + le32_to_cpu(
 			a->value_length) > le32_to_cpu(a->length)) {
 		ntfs_log_debug(FAILED);
-		ntfs_log_debug("Error: Attribute $VOLUME_INFORMATION in $Volume is "
-				"corrupt!\n");
+		ntfs_log_debug("Error: Attribute $VOLUME_INFORMATION in "
+				"$Volume is corrupt!\n");
 		errno = EIO;
 		goto error_exit;
 	}
@@ -1009,9 +1014,10 @@ ntfs_volume *ntfs_device_mount(struct nt
 			ctx)) {
 		if (errno != ENOENT) {
 			ntfs_log_debug(FAILED);
-			ntfs_log_debug("Error: Lookup of $VOLUME_NAME attribute in "
-					"$Volume failed.  This probably means "
-					"something is corrupt.  Run chkdsk.\n");
+			ntfs_log_debug("Error: Lookup of $VOLUME_NAME "
+					"attribute in $Volume failed.  "
+					"This probably means something is "
+					"corrupt.  Run chkdsk.\n");
 			goto error_exit;
 		}
 		/*
@@ -1044,8 +1050,8 @@ ntfs_volume *ntfs_device_mount(struct nt
 		 */
 		vol->vol_name = NULL;
 		if (ntfs_ucstombs(vname, u, &vol->vol_name, 0) == -1) {
-			ntfs_log_perror("Error: Volume name could not be converted "
-					"to current locale");
+			ntfs_log_perror("Error: Volume name could not be "
+					"converted to current locale");
 			ntfs_log_debug("Forcing name into ASCII by replacing "
 				"non-ASCII characters with underscores.\n");
 			vol->vol_name = ntfs_malloc(u + 1);
@@ -1083,8 +1089,8 @@ ntfs_volume *ntfs_device_mount(struct nt
 	/* Check we don't overflow 32-bits. */
 	if (na->data_size > 0xffffffffLL) {
 		ntfs_log_debug(FAILED);
-		ntfs_log_debug("Error: Attribute definition table is too big (max "
-				"32-bit allowed).\n");
+		ntfs_log_debug("Error: Attribute definition table is too big "
+				"(max 32-bit allowed).\n");
 		errno = EINVAL;
 		goto error_exit;
 	}
@@ -1098,8 +1104,8 @@ ntfs_volume *ntfs_device_mount(struct nt
 	l = ntfs_attr_pread(na, 0, na->data_size, vol->attrdef);
 	if (l != na->data_size) {
 		ntfs_log_debug(FAILED);
-		ntfs_log_debug("Amount of data read does not correspond to expected "
-				"length!\n");
+		ntfs_log_debug("Amount of data read does not correspond to "
+				"expected length!\n");
 		errno = EIO;
 		goto error_exit;
 	}
@@ -1112,7 +1118,7 @@ ntfs_volume *ntfs_device_mount(struct nt
 	 * Check for dirty logfile and hibernated Windows.
 	 * We care only about read-write mounts.
 	 */
-	if (!(flags & MS_RDONLY)) {
+	if (!(flags & NTFS_MNT_RDONLY)) {
 		if (ntfs_volume_check_logfile(vol) < 0)
 			goto error_exit;
 		if (ntfs_volume_check_hiberfile(vol) < 0)
@@ -1141,11 +1147,13 @@ error_exit:
  * This function mounts an ntfs volume. @name should contain the name of the
  * device/file to mount as the ntfs volume.
  *
- * @flags is an optional second parameter. The same flags are used as for
- * the mount system call (man 2 mount). Currently only the following flags
+ * @flags is an optional second parameter. Some flags are similar to flags used
+ * as for the mount system call (man 2 mount). Currently the following flags
  * are implemented:
- *	MS_RDONLY	- mount volume read-only
- *	MS_NOATIME	- do not update access time
+ *	NTFS_MNT_RDONLY		- mount volume read-only
+ *	NTFS_MNT_NOATIME	- do not update access time
+ *	NTFS_MNT_CASE_SENSITIVE - treat filenames as case sensitive even if
+ *				  they are not in POSIX namespace
  *
  * The function opens the device or file @name and verifies that it contains a
  * valid bootsector. Then, it allocates an ntfs_volume structure and initializes
@@ -1160,7 +1168,7 @@ error_exit:
  * soon as the function returns.
  */
 ntfs_volume *ntfs_mount(const char *name __attribute__((unused)),
-		unsigned long flags __attribute__((unused)))
+		ntfs_mount_flags flags __attribute__((unused)))
 {
 #ifndef NO_NTFS_DEVICE_DEFAULT_IO_OPS
 	struct ntfs_device *dev;
@@ -1378,7 +1386,7 @@ int ntfs_check_if_mounted(const char *fi
  * Version 1.1 and 1.2 are used by Windows NT3.x and NT4.
  * Version 2.x is used by Windows 2000 Betas.
  * Version 3.0 is used by Windows 2000.
- * Version 3.1 is used by Windows XP, Windows Server 2003 and Longhorn.
+ * Version 3.1 is used by Windows XP, Windows Server 2003 and Vista.
  *
  * Return 0 if NTFS version is supported otherwise -1 with errno set.
  *

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs volume.h,1.24,1.25

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs
In directory delta357:/tmp/cvs-serv12327/include/ntfs

Modified Files:
	volume.h 
Log Message:

* Rename MS_{RDONLY,NOATIME} to NTFS_MNT_{RDONLY,NOATIME}.
* Introduce NTFS_MNT_CASE_SENSITIVE.


Index: volume.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/volume.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- volume.h	17 Jul 2006 11:49:52 -0000	1.24
+++ volume.h	12 Nov 2006 22:46:50 -0000	1.25
@@ -41,25 +41,6 @@
 #include <mntent.h>
 #endif
 
-/*
- * Under Cygwin, DJGPP and FreeBSD we do not have MS_RDONLY and MS_NOATIME,
- * so we define them ourselves.
- */
-#ifndef MS_RDONLY
-#define MS_RDONLY 1
-#endif
-/*
- * Solaris defines MS_RDONLY but not MS_NOATIME thus we need to carefully
- * define MS_NOATIME.
- */
-#ifndef MS_NOATIME
-#if (MS_RDONLY != 1)
-#	define MS_NOATIME 1
-#else
-#	define MS_NOATIME 2
-#endif
-#endif
-
 /* Forward declaration */
 typedef struct _ntfs_volume ntfs_volume;
 
@@ -72,13 +53,24 @@ typedef struct _ntfs_volume ntfs_volume;
 /**
  * enum ntfs_mount_flags -
  *
+ * Flags for the ntfs_mount() function.
+ */
+typedef enum {
+	NTFS_MNT_RDONLY	 	= 1,
+	NTFS_MNT_NOATIME 	= 2,
+	NTFS_MNT_CASE_SENSITIVE	= 4,
+} ntfs_mount_flags;
+
+/**
+ * enum ntfs_mounted_flags -
+ *
  * Flags returned by the ntfs_check_if_mounted() function.
  */
 typedef enum {
 	NTFS_MF_MOUNTED		= 1,	/* Device is mounted. */
 	NTFS_MF_ISROOT		= 2,	/* Device is mounted as system root. */
 	NTFS_MF_READONLY	= 4,	/* Device is mounted read-only. */
-} ntfs_mount_flags;
+} ntfs_mounted_flags;
 
 extern int ntfs_check_if_mounted(const char *file, unsigned long *mnt_flags);
 
@@ -214,13 +206,13 @@ struct _ntfs_volume {
 extern ntfs_volume *ntfs_volume_alloc(void);
 
 extern ntfs_volume *ntfs_volume_startup(struct ntfs_device *dev,
-		unsigned long flags);
+		ntfs_mount_flags flags);
 
 extern ntfs_volume *ntfs_device_mount(struct ntfs_device *dev,
-		unsigned long flags);
+		ntfs_mount_flags flags);
 extern int ntfs_device_umount(ntfs_volume *vol, const BOOL force);
 
-extern ntfs_volume *ntfs_mount(const char *name, unsigned long flags);
+extern ntfs_volume *ntfs_mount(const char *name, ntfs_mount_flags flags);
 extern int ntfs_umount(ntfs_volume *vol, const BOOL force);
 
 extern int ntfs_version_is_supported(ntfs_volume *vol);

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.415,1.416

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357:/tmp/cvs-serv12327

Modified Files:
	ChangeLog 
Log Message:

* Rename MS_{RDONLY,NOATIME} to NTFS_MNT_{RDONLY,NOATIME}.
* Introduce NTFS_MNT_CASE_SENSITIVE.


Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -p -r1.415 -r1.416
--- ChangeLog	10 Nov 2006 16:07:45 -0000	1.415
+++ ChangeLog	12 Nov 2006 22:46:50 -0000	1.416
@@ -64,7 +64,9 @@ xx/xx/2006 - x.xx.x - .
 	- Change malloc() calls to ntfs_malloc().  (Szaka)
 	- ntfsmount: require FUSE version >= 2.6.0 for build. Fixes fusermount
 	  lookup problem and allows to drop compatibility code.  (Yura)
-	- Rewrite ntfs_attr_add() algorithm.  (Yura)
+	- Rewrite ntfs_attr_add() algorithm to be faster and cleverer.  (Yura)
+	- Rename MS_{RDONLY,NOATIME} to NTFS_MNT_{RDONLY,NOATIME}. Introduce
+	  NTFS_MNT_CASE_SENSITIVE.  (Yura)
 
 21/06/2006 - 1.13.1 - Various fixes.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.90,1.91

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv14248/ntfsprogs

Modified Files:
	ntfsmount.c 
Log Message:
* fmask=0111 and dmask=0 by default
* bit more nice mount messages


Index: ntfsmount.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- ntfsmount.c	6 Nov 2006 12:51:45 -0000	1.90
+++ ntfsmount.c	10 Nov 2006 17:23:12 -0000	1.91
@@ -1399,8 +1399,8 @@ static int ntfs_fuse_init(void)
 		.state = NF_FreeClustersOutdate | NF_FreeMFTOutdate,
 		.uid = geteuid(),
 		.gid = getegid(),
-		.fmask = 0177,
-		.dmask = 0077,
+		.fmask = 0111,
+		.dmask = 0,
 		.streams = NF_STREAMS_INTERFACE_NONE,
 	};
 	return 0;
@@ -1837,8 +1837,8 @@ int main(int argc, char *argv[])
 	}
 	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",
+	ntfs_log_info("Mounted %s (%s, label \"%s\", NTFS version %d.%d)\n",
+			opts.device, (ctx->ro) ? "Read-Only" : "Read-Write",
 			ctx->vol->vol_name, ctx->vol->major_ver,
 			ctx->vol->minor_ver);
 	/* Main loop. */

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.414,1.415

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357:/tmp/cvs-serv5557

Modified Files:
	ChangeLog 
Log Message:
revert factoring out ntfs_attr_fill_hole(), agree that it should be refactored,
but passing all args as pointers and changing them there (especially
update_from that changes only inside new function, but rollback depends on it
in pwrite)


Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -p -r1.414 -r1.415
--- ChangeLog	9 Nov 2006 21:19:11 -0000	1.414
+++ ChangeLog	10 Nov 2006 16:07:45 -0000	1.415
@@ -62,7 +62,6 @@ xx/xx/2006 - x.xx.x - .
 	- Move ntfs_index_entry_mark_dirty() to index.c.  (Szaka)
 	- Introduce misc.c. Move ntfs_[mc]alloc there.  (Szaka)
 	- Change malloc() calls to ntfs_malloc().  (Szaka)
-	- Factor ntfs_attr_fill_hole() out of ntfs_attr_pwrite().  (Szaka)
 	- ntfsmount: require FUSE version >= 2.6.0 for build. Fixes fusermount
 	  lookup problem and allows to drop compatibility code.  (Yura)
 	- Rewrite ntfs_attr_add() algorithm.  (Yura)

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.234,1.235

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv5557/libntfs

Modified Files:
	attrib.c 
Log Message:
revert factoring out ntfs_attr_fill_hole(), agree that it should be refactored,
but passing all args as pointers and changing them there (especially
update_from that changes only inside new function, but rollback depends on it
in pwrite)


Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -p -r1.234 -r1.235
--- attrib.c	9 Nov 2006 21:19:12 -0000	1.234
+++ attrib.c	10 Nov 2006 16:07:46 -0000	1.235
@@ -920,154 +920,6 @@ rl_err_out:
 	return -1;
 }
 
-static int ntfs_attr_fill_hole(ntfs_attr *na, s64 count, s64 *ofs,
-			runlist_element **rl, VCN *update_from)
-{
-	s64 to_write;
-	ntfs_volume *vol = na->ni->vol;
-	int eo, ret = -1;
-	runlist *rlc;
-	LCN lcn_seek_from = -1;
-	VCN cur_vcn, from_vcn;
-
-	to_write = min(count, ((*rl)->length << vol->cluster_size_bits) - *ofs);
-
-	/* Instantiate the hole. */
-	cur_vcn = (*rl)->vcn;
-	from_vcn = (*rl)->vcn + (*ofs >> vol->cluster_size_bits);
-	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("Failed to find run after mapping runlist. "
-				"Please report to %s.\n", NTFS_DEV_LIST);
-		errno = EIO;
-		goto err_out;
-	}
-	/*
-	 * Search backwards to find the best lcn to start
-	 * seek from.
-	 */
-	rlc = *rl;
-	while (rlc->vcn) {
-		rlc--;
-		if (rlc->lcn >= 0) {
-			lcn_seek_from = rlc->lcn + (from_vcn - rlc->vcn);
-			break;
-		}
-	}
-	if (lcn_seek_from == -1) {
-		/* Backwards search failed, search forwards. */
-		rlc = *rl;
-		while (rlc->length) {
-			rlc++;
-			if (rlc->lcn >= 0) {
-				lcn_seek_from = rlc->lcn -
-					(rlc->vcn - from_vcn);
-				break;
-			}
-		}
-	}
-	/* Allocate clusters to instantiate the hole. */
-	rlc = ntfs_cluster_alloc(vol, from_vcn,
-				((*ofs + to_write - 1) >>
-				vol->cluster_size_bits) + 1 +
-				(*rl)->vcn - from_vcn,
-				lcn_seek_from, DATA_ZONE);
-	if (!rlc) {
-		ntfs_log_perror("Hole filling cluster allocation failed");
-		goto err_out;
-	}
-	/* Merge runlists. */
-	*rl = ntfs_runlists_merge(na->rl, rlc);
-	if (!*rl) {
-		eo = errno;
-		ntfs_log_trace("Failed to merge runlists.\n");
-		if (ntfs_cluster_free_from_rl(vol, rlc)) {
-			ntfs_log_trace("Failed to free just "
-				"allocated clusters. Leaving "
-				"inconsistent metadata. "
-				"Run chkdsk\n");
-		}
-		errno = eo;
-		goto err_out;
-	}
-	na->rl = *rl;
-	if (*update_from == -1)
-		*update_from = from_vcn;
-	*rl = ntfs_attr_find_vcn(na, cur_vcn);
-	if (!*rl) {
-		/*
-		 * It's definitely a BUG, if we failed to find @cur_vcn, because
-		 * we missed it during instantiating of the hole.
-		 */
-		ntfs_log_error("BUG! Failed to find run after hole "
-				"instantiating. Please report to the %s.\n",
-				NTFS_DEV_LIST);
-		errno = EIO;
-		goto err_out;
-	}
-	/* If leaved part of the hole go to the next run. */
-	if ((*rl)->lcn < 0)
-		(*rl)++;
-	/* Now LCN shoudn't be less than 0. */
-	if ((*rl)->lcn < 0) {
-		ntfs_log_error("BUG! LCN is lesser than 0. "
-				"Please report to the %s.\n", NTFS_DEV_LIST);
-		errno = EIO;
-		goto err_out;
-	}
-	if (*ofs) {
-		/*
-		 * Need to clear region between start of
-		 * @cur_vcn cluster and @*ofs.
-		 */
-		char *buf;
-
-		buf = ntfs_malloc(*ofs);
-		if (!buf) {
-			errno = ENOMEM;
-			goto err_out;
-		}
-		memset(buf, 0, *ofs);
-		if (ntfs_rl_pwrite(vol, na->rl, cur_vcn <<
-					vol->cluster_size_bits, *ofs, buf) < 0) {
-			eo = errno;
-			ntfs_log_perror("Failed to zero area");
-			free(buf);
-			errno = eo;
-			goto err_out;
-		}
-		free(buf);
-	}
-	if ((*rl)->vcn < cur_vcn) {
-		/*
-		 * Clusters that replaced hole are merged with
-		 * previous run, so we need to update offset.
-		 */
-		*ofs += (cur_vcn - (*rl)->vcn) << vol->cluster_size_bits;
-	}
-	if ((*rl)->vcn > cur_vcn) {
-		/*
-		 * We left part of the hole, so we need to update the offset.
-		 */
-		*ofs -= ((*rl)->vcn - cur_vcn) << vol->cluster_size_bits;
-	}
-
-	ret = 0;
-err_out:
-	return ret;
-}
-
 /**
  * ntfs_attr_pwrite - positioned write to an ntfs attribute
  * @na:		ntfs attribute to write to
@@ -1089,8 +941,7 @@ err_out:
  */
 s64 ntfs_attr_pwrite(ntfs_attr *na, const s64 pos, s64 count, const void *b)
 {
-	s64 written, to_write, ofs, old_initialized_size, old_data_size;
-	s64 total = 0;
+	s64 written, to_write, ofs, total, old_initialized_size, old_data_size;
 	VCN update_from = -1;
 	ntfs_volume *vol;
 	ntfs_attr_search_ctx *ctx = NULL;
@@ -1099,7 +950,8 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 	struct {
 		unsigned int undo_initialized_size	: 1;
 		unsigned int undo_data_size		: 1;
-	} need_to = { 0, 0 };
+		unsigned int update_mapping_pairs	: 1;
+	} need_to = { 0, 0, 0 };
 
 	ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x, pos 0x%llx, count "
 			"0x%llx.\n", na->ni->mft_no, na->type, (long long)pos,
@@ -1175,7 +1027,7 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 		ntfs_attr_put_search_ctx(ctx);
 		return count;
 	}
-
+	total = 0;
 	/* Handle writes beyond initialized_size. */
 	if (pos + count > na->initialized_size) {
 		if (ntfs_attr_map_whole_runlist(na))
@@ -1272,22 +1124,174 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 			goto rl_err_out;
 		}
 		if (rl->lcn < (LCN)0) {
+			LCN lcn_seek_from = -1;
+			runlist *rlc;
+			VCN cur_vcn, from_vcn;
+
 			if (rl->lcn != (LCN)LCN_HOLE) {
 				errno = EIO;
 				goto rl_err_out;
 			}
-
-			if (ntfs_attr_fill_hole(na, count, &ofs, &rl,
-					&update_from))
+			
+			to_write = min(count, (rl->length <<
+					vol->cluster_size_bits) - ofs);
+			
+			/* Instantiate the hole. */
+			cur_vcn = rl->vcn;
+			from_vcn = rl->vcn + (ofs >> vol->cluster_size_bits);
+			ntfs_log_trace("Instantiate 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.
+			 */
+			rlc = rl;
+			while (rlc->vcn) {
+				rlc--;
+				if (rlc->lcn >= 0) {
+					lcn_seek_from = rlc->lcn +
+							(from_vcn - rlc->vcn);
+					break;
+				}
+			}
+			if (lcn_seek_from == -1) {
+				/* Backwards search failed, search forwards. */
+				rlc = rl;
+				while (rlc->length) {
+					rlc++;
+					if (rlc->lcn >= 0) {
+						lcn_seek_from = rlc->lcn -
+							(rlc->vcn - from_vcn);
+						break;
+					}
+				}
+			}
+			/* Allocate clusters to instantiate the hole. */
+			rlc = ntfs_cluster_alloc(vol, from_vcn,
+						((ofs + to_write - 1) >>
+						vol->cluster_size_bits) + 1 +
+						rl->vcn - from_vcn,
+						lcn_seek_from, DATA_ZONE);
+			if (!rlc) {
+				eo = errno;
+				ntfs_log_trace("Failed to allocate clusters "
+						"for hole instantiating.\n");
+				errno = eo;
+				goto err_out;
+			}
+			/* Merge runlists. */
+			rl = ntfs_runlists_merge(na->rl, rlc);
+			if (!rl) {
+				eo = errno;
+				ntfs_log_trace("Failed to merge runlists.\n");
+				if (ntfs_cluster_free_from_rl(vol, rlc)) {
+					ntfs_log_trace("Failed to free just "
+						"allocated clusters. Leaving "
+						"inconsistent metadata. "
+						"Run chkdsk\n");
+				}
+				errno = eo;
+				goto err_out;
+			}
+			na->rl = rl;
+			need_to.update_mapping_pairs = 1;
+			if (update_from == -1)
+				update_from = from_vcn;
+			rl = ntfs_attr_find_vcn(na, cur_vcn);
+			if (!rl) {
+				/*
+				 * It's definitely a BUG, if we failed to find
+				 * @cur_vcn, because we missed it during
+				 * instantiating of the hole.
+				 */
+				ntfs_log_error("BUG! Failed to find run after "
+						"instantiating. Please report "
+						"to the %s.\n", NTFS_DEV_LIST);
+				errno = EIO;
+				goto err_out;
+			}
+			/* If leaved part of the hole go to the next run. */
+			if (rl->lcn < 0)
+				rl++;
+			/* Now LCN shoudn't be less than 0. */
+			if (rl->lcn < 0) {
+				ntfs_log_error("BUG! LCN is lesser than 0. "
+						"Please report to the %s.\n",
+						NTFS_DEV_LIST);
+				errno = EIO;
+				goto err_out;
+			}
+			if (ofs) {
+				/*
+				 * Need to clear region between start of
+				 * @cur_vcn cluster and @ofs.
+				 */
+				char *buf;
 
+				buf = malloc(ofs);
+				if (!buf) {
+					ntfs_log_trace("Not enough memory to "
+							"allocate %lld "
+							"bytes.\n", ofs);
+					errno = ENOMEM;
+					goto err_out;
+				}
+				memset(buf, 0, ofs);
+				if (ntfs_rl_pwrite(vol, na->rl, cur_vcn <<
+							vol->cluster_size_bits,
+							ofs, buf) < 0) {
+					eo = errno;
+					ntfs_log_trace("Failed to zero "
+							"area.\n");
+					free(buf);
+					errno = eo;
+					goto err_out;
+				}
+				free(buf);
+			}
+			if (rl->vcn < cur_vcn) {
+				/*
+				 * Clusters that replaced hole are merged with
+				 * previous run, so we need to update offset.
+				 */
+				ofs += (cur_vcn - rl->vcn) <<
+					vol->cluster_size_bits;
+			}
+			if (rl->vcn > cur_vcn) {
+				/*
+				 * We left part of the hole, so update we need
+				 * to update offset
+				 */
+				ofs -= (rl->vcn - cur_vcn) <<
+					vol->cluster_size_bits;
+			}
+		}
 		/* It is a real lcn, write it to the volume. */
 		to_write = min(count, (rl->length << vol->cluster_size_bits) -
 				ofs);
 retry:
-		ntfs_log_trace("Writing %lld bytes to vcn %lld, lcn %lld, ofs "
-				"%lld.\n", to_write, rl->vcn, rl->lcn, ofs);
+		ntfs_log_trace("Writing 0x%llx bytes to vcn 0x%llx, lcn 0x%llx,"
+				" ofs 0x%llx.\n", to_write, rl->vcn, rl->lcn,
+				ofs);
 		if (!NVolReadOnly(vol))
 			written = ntfs_pwrite(vol->dev, (rl->lcn <<
 					vol->cluster_size_bits) + ofs,
@@ -1312,7 +1316,7 @@ done:
 	if (ctx)
 		ntfs_attr_put_search_ctx(ctx);
 	/* Update mapping pairs if needed. */
-	if (update_from != -1)
+	if (need_to.update_mapping_pairs)
 		ntfs_attr_update_mapping_pairs(na, 0 /*update_from*/);
 	/* Finally, return the number of bytes written. */
 	return total;
@@ -1370,7 +1374,7 @@ err_out:
 	if (ctx)
 		ntfs_attr_put_search_ctx(ctx);
 	/* Update mapping pairs if needed. */
-	if (update_from != -1)
+	if (need_to.update_mapping_pairs)
 		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))

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c, 1.233, 1.234 inode.c, 1.88, 1.89

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv26130/libntfs

Modified Files:
	attrib.c inode.c 
Log Message:
Spent really a lot of time applying various "optimizations" from ntfs-3g and
finally figured out that ntfs-3g is faster than ntfsmount only because of
3 reasons:
1) turned on noatime option by default
2) ntfs-3g builds without debug output by default
3) the only real optimization: almost always add resident attributes.
However by accident patch in ntfs-3g for 3) breaks several code paths (why
I am not surprised?), thus I rewrote whole ntfs_attr_add() logic.


Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -r1.233 -r1.234
--- attrib.c	7 Nov 2006 10:37:25 -0000	1.233
+++ attrib.c	9 Nov 2006 21:19:12 -0000	1.234
@@ -2946,7 +2946,8 @@ int ntfs_attr_add(ntfs_inode *ni, ATTR_T
 {
 	u32 attr_rec_size;
 	int err, i, offset;
-	BOOL is_resident;
+	BOOL is_resident = TRUE;
+	BOOL always_non_resident = FALSE, always_resident = FALSE;
 	ntfs_inode *attr_ni;
 	ntfs_attr *na;
 
@@ -2993,38 +2994,29 @@ int ntfs_attr_add(ntfs_inode *ni, ATTR_T
 			errno = ERANGE;
 			return -1;
 		}
+		always_resident = TRUE;
 	}
 
-	/*
-	 * Determine resident or not will be new attribute. We add 8 to size in
-	 * non resident case for mapping pairs.
-	 */
-	if (!ntfs_attr_can_be_resident(ni->vol, type)) {
-		/* Attribute can be resident. */
-		is_resident = TRUE;
-		/* Check if it is better to make attribute non resident. */
-		if (!ntfs_attr_can_be_non_resident(ni->vol, type) &&
-				offsetof(ATTR_RECORD, resident_end) + size >=
-				offsetof(ATTR_RECORD, non_resident_end) + 8)
-			/* Make it non resident. */
-			is_resident = FALSE;
-	} else {
+	/* Check whether attribute can be resident. */
+	if (ntfs_attr_can_be_resident(ni->vol, type)) {
 		if (errno != EPERM) {
 			err = errno;
-			ntfs_log_trace("ntfs_attr_can_be_resident failed.\n");
+			ntfs_log_trace("ntfs_attr_can_be_resident() failed.\n");
 			goto err_out;
 		}
-		/* Attribute can't be resident. */
 		is_resident = FALSE;
+		always_non_resident = TRUE;
 	}
+
+retry:
 	/* Calculate attribute record size. */
 	if (is_resident)
 		attr_rec_size = offsetof(ATTR_RECORD, resident_end) +
-				((name_len * sizeof(ntfschar) + 7) & ~7) +
-				((size + 7) & ~7);
-	else
+				ROUND_UP(name_len * sizeof(ntfschar), 3) +
+				ROUND_UP(size, 3);
+	else /* We add 8 for space for mapping pairs. */
 		attr_rec_size = offsetof(ATTR_RECORD, non_resident_end) +
-				((name_len * sizeof(ntfschar) + 7) & ~7) + 8;
+				ROUND_UP(name_len * sizeof(ntfschar), 3) + 8;
 
 	/*
 	 * If we have enough free space for the new attribute in the base MFT
@@ -3050,6 +3042,20 @@ int ntfs_attr_add(ntfs_inode *ni, ATTR_T
 			goto add_attr_record;
 	}
 
+	/* 
+	 * If failed to find space for resident attribute, then try to find
+	 * space for non resident one.
+	 */
+	if (is_resident && !always_resident) {
+		is_resident = FALSE;
+		goto retry;
+	}
+
+	/*
+	 * FIXME: Try to make other attributes non-resident here. Factor out
+	 * code from ntfs_resident_attr_resize.
+	 */
+
 	/* There is no extent that contain enough space for new attribute. */
 	if (!NInoAttrList(ni)) {
 		/* Add attribute list not present, add it and retry. */
@@ -3060,7 +3066,7 @@ int ntfs_attr_add(ntfs_inode *ni, ATTR_T
 		}
 		return ntfs_attr_add(ni, type, name, name_len, val, size);
 	}
-	/* Allocate new extent. */
+	/* Allocate new extent for attribute. */
 	attr_ni = ntfs_mft_record_alloc(ni->vol, ni);
 	if (!attr_ni) {
 		err = errno;
@@ -3068,6 +3074,21 @@ int ntfs_attr_add(ntfs_inode *ni, ATTR_T
 		goto err_out;
 	}
 
+	/*
+	 * Determine resident or not will be attribute using heuristics and
+	 * calculate attribute record size. FIXME: small code duplication here.
+	 */
+	if (always_resident || (!always_non_resident && size < 256)) {
+		is_resident = TRUE;
+		attr_rec_size = offsetof(ATTR_RECORD, resident_end) +
+				ROUND_UP(name_len * sizeof(ntfschar), 3) +
+				ROUND_UP(size, 3);
+	} else { /* We add 8 for space for mapping pairs. */
+		is_resident = FALSE;
+		attr_rec_size = offsetof(ATTR_RECORD, non_resident_end) +
+				ROUND_UP(name_len * sizeof(ntfschar), 3) + 8;
+	}
+
 add_attr_record:
 	if (is_resident) {
 		/* Add resident attribute. */
@@ -3698,14 +3719,14 @@ static int ntfs_resident_attr_resize(ntf
 	if (ntfs_attr_size_bounds_check(vol, na->type, newsize) < 0) {
 		err = errno;
 		if (err == ERANGE) {
-			ntfs_log_trace("Eeek!  Size bounds check failed.  "
+			ntfs_log_trace("Size bounds check failed.  "
 					"Aborting...\n");
 		} else if (err == ENOENT)
 			err = EIO;
 		goto put_err_out;
 	}
 	/*
-	 * If @newsize is bigger than the mft record we need to make the
+	 * If @newsize is bigger than the MFT record we need to make the
 	 * attribute non-resident if the attribute type supports it. If it is
 	 * smaller we can go ahead and attempt the resize.
 	 */
@@ -3715,7 +3736,7 @@ static int ntfs_resident_attr_resize(ntf
 				newsize)) {
 			/* Update attribute size everywhere. */
 			na->data_size = na->initialized_size = newsize;
-			na->allocated_size = (newsize + 7) & ~7;
+			na->allocated_size = ROUND_UP(newsize, 3);
 			if (NAttrCompressed(na) || NAttrSparse(na))
 				na->compressed_size = na->allocated_size;
 			if (na->type == AT_DATA && na->name == AT_UNNAMED) {
@@ -3728,12 +3749,12 @@ static int ntfs_resident_attr_resize(ntf
 		/* Error! If not enough space, just continue. */
 		if (errno != ENOSPC) {
 			err = errno;
-			ntfs_log_trace("Eeek!  Failed to resize resident part "
+			ntfs_log_trace("Failed to resize resident part "
 					"of attribute.  Aborting...\n");
 			goto put_err_out;
 		}
 	}
-	/* There is not enough space in the mft record to perform the resize. */
+	/* There is not enough space in the MFT record to perform the resize. */
 
 	/* Make the attribute non-resident if possible. */
 	if (!ntfs_attr_make_non_resident(na, ctx)) {
@@ -3743,7 +3764,7 @@ static int ntfs_resident_attr_resize(ntf
 		return ntfs_attr_truncate(na, newsize);
 	} else if (errno != ENOSPC && errno != EPERM) {
 		err = errno;
-		ntfs_log_trace("Eeek!  Failed to make attribute non-resident.  "
+		ntfs_log_trace("Failed to make attribute non-resident.  "
 				"Aborting...\n");
 		goto put_err_out;
 	}
@@ -3763,8 +3784,8 @@ static int ntfs_resident_attr_resize(ntf
 		 * pairs will take 8 bytes.
 		 */
 		if (le32_to_cpu(a->length) <= offsetof(ATTR_RECORD,
-				compressed_size) + ((a->name_length *
-				sizeof(ntfschar) + 7) & ~7) + 8)
+				compressed_size) + ROUND_UP(a->name_length *
+				sizeof(ntfschar), 3) + 8)
 			continue;
 
 		tna = ntfs_attr_open(na->ni, a->type, (ntfschar*)((u8*)a +
@@ -3804,7 +3825,7 @@ static int ntfs_resident_attr_resize(ntf
 	}
 
 	/*
-	 * Move the attribute to a new mft record, creating an attribute list
+	 * Move the attribute to a new MFT record, creating an attribute list
 	 * attribute or modifying it if it is already present.
 	 */
 
@@ -3855,7 +3876,7 @@ static int ntfs_resident_attr_resize(ntf
 			return -1;
 		return ntfs_resident_attr_resize(na, newsize);
 	}
-	/* Allocate new mft record. */
+	/* Allocate new MFT record. */
 	ni = ntfs_mft_record_alloc(vol, ni);
 	if (!ni) {
 		err = errno;

Index: inode.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/inode.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- inode.c	1 Nov 2006 13:30:40 -0000	1.88
+++ inode.c	9 Nov 2006 21:19:12 -0000	1.89
@@ -354,7 +354,8 @@ ntfs_inode *ntfs_extent_inode_open(ntfs_
 		errno = EINVAL;
 		return NULL;
 	}
-	ntfs_log_trace("Opening extent inode 0x%llx (base mft record 0x%llx).\n",
+	ntfs_log_trace("Opening extent inode 0x%llx "
+			"(base MFT record 0x%llx).\n",
 			(unsigned long long)mft_no,
 			(unsigned long long)base_ni->mft_no);
 	/* Is the extent inode already open and attached to the base inode? */
@@ -370,8 +371,9 @@ ntfs_inode *ntfs_extent_inode_open(ntfs_
 			seq_no = MSEQNO_LE(mref);
 			if (seq_no && seq_no != le16_to_cpu(
 					ni->mrec->sequence_number)) {
-				ntfs_log_debug("Found stale extent mft reference! "
-					"Corrupt file system. Run chkdsk.\n");
+				ntfs_log_debug("Found stale extent mft "
+						"reference! Corrupt file "
+						"system. Run chkdsk.\n");
 				errno = EIO;
 				return NULL;
 			}
@@ -440,7 +442,7 @@ int ntfs_inode_attach_all_extents(ntfs_i
 		return 0;
 
 	if (!ni->attr_list) {
-		ntfs_log_trace("Corrupt in-memory struct.\n");
+		ntfs_log_trace("Corrupted in-memory structure.\n");
 		errno = EINVAL;
 		return -1;
 	}
@@ -453,7 +455,8 @@ int ntfs_inode_attach_all_extents(ntfs_i
 				prev_attached != MREF_LE(ale->mft_reference)) {
 			if (!ntfs_extent_inode_open(ni,
 					MREF_LE(ale->mft_reference))) {
-				ntfs_log_trace("Couldn't attach extent inode.\n");
+				ntfs_log_trace("Couldn't attach extent "
+						"inode.\n");
 				return -1;
 			}
 			prev_attached = MREF_LE(ale->mft_reference);

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs support.h,1.14,1.15

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs
In directory delta357:/tmp/cvs-serv26130/include/ntfs

Modified Files:
	support.h 
Log Message:
Spent really a lot of time applying various "optimizations" from ntfs-3g and
finally figured out that ntfs-3g is faster than ntfsmount only because of
3 reasons:
1) turned on noatime option by default
2) ntfs-3g builds without debug output by default
3) the only real optimization: almost always add resident attributes.
However by accident patch in ntfs-3g for 3) breaks several code paths (why
I am not surprised?), thus I rewrote whole ntfs_attr_add() logic.


Index: support.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/support.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- support.h	1 Nov 2006 13:30:40 -0000	1.14
+++ support.h	9 Nov 2006 21:19:12 -0000	1.15
@@ -71,9 +71,9 @@
 /*
  * Round up and down @num to 2 in power of @order.
  */
-#define ROUND_UP(num,order)	(((num) + ((1 << order) - 1)) & \
-				~((1 << order) - 1))
-#define ROUND_DOWN(num,order)	((num) & ~((1 << order) - 1))
+#define ROUND_UP(num,order)	(((num) + ((1 << (order)) - 1)) & \
+				~((1 << (order)) - 1))
+#define ROUND_DOWN(num,order)	((num) & ~((1 << (order)) - 1))
 
 /*
  * Simple bit operation macros. NOTE: These are NOT atomic.

[Linux-NTFS-cvs] CVS: ntfsprogs .cvsignore, 1.8, 1.9 ChangeLog, 1.413, 1.414

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357:/tmp/cvs-serv26130

Modified Files:
	.cvsignore ChangeLog 
Log Message:
Spent really a lot of time applying various "optimizations" from ntfs-3g and
finally figured out that ntfs-3g is faster than ntfsmount only because of
3 reasons:
1) turned on noatime option by default
2) ntfs-3g builds without debug output by default
3) the only real optimization: almost always add resident attributes.
However by accident patch in ntfs-3g for 3) breaks several code paths (why
I am not surprised?), thus I rewrote whole ntfs_attr_add() logic.


Index: .cvsignore
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	8 Aug 2005 21:19:14 -0000	1.8
+++ .cvsignore	9 Nov 2006 21:19:11 -0000	1.9
@@ -22,3 +22,4 @@ stamp-h.in
 ltconfig
 missing
 INSTALL
+cscope.out

Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -p -r1.413 -r1.414
--- ChangeLog	5 Nov 2006 21:40:57 -0000	1.413
+++ ChangeLog	9 Nov 2006 21:19:11 -0000	1.414
@@ -65,6 +65,7 @@ xx/xx/2006 - x.xx.x - .
 	- Factor ntfs_attr_fill_hole() out of ntfs_attr_pwrite().  (Szaka)
 	- ntfsmount: require FUSE version >= 2.6.0 for build. Fixes fusermount
 	  lookup problem and allows to drop compatibility code.  (Yura)
+	- Rewrite ntfs_attr_add() algorithm.  (Yura)
 
 21/06/2006 - 1.13.1 - Various fixes.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.232,1.233

[Anton A. <ai...@de...>]

Changes by: aia21

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv9505

Modified Files:
	attrib.c 
Log Message:
Make a little nicer.


Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -p -r1.232 -r1.233
--- attrib.c	1 Nov 2006 20:20:18 -0000	1.232
+++ attrib.c	7 Nov 2006 10:37:25 -0000	1.233
@@ -77,8 +77,7 @@ s64 ntfs_get_attribute_value_length(cons
 	errno = 0;
 	if (a->non_resident)
 		return sle64_to_cpu(a->data_size);
-	else
-		return (s64)le32_to_cpu(a->value_length);
+	return (s64)le32_to_cpu(a->value_length);
 }
 
 /**

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs mft.c, 1.48, 1.49 misc.c, 1.1, 1.2

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv3733/libntfs

Modified Files:
	mft.c misc.c 
Log Message:
Fix typo and build with disabled error handling 


Index: mft.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/mft.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- mft.c	1 Nov 2006 13:30:40 -0000	1.48
+++ mft.c	6 Nov 2006 17:11:02 -0000	1.49
@@ -386,9 +386,7 @@ int ntfs_mft_record_format(const ntfs_vo
 	return 0;
 }
 
-#ifndef NTFS_DISABLE_DEBUG_LOGGING
 static const char *es = "  Leaving inconsistent metadata.  Run chkdsk.";
-#endif
 
 /**
  * ntfs_ffz - Find the first unset (zero) bit in a word

Index: misc.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/misc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- misc.c	1 Nov 2006 12:31:11 -0000	1.1
+++ misc.c	6 Nov 2006 17:11:02 -0000	1.2
@@ -1,5 +1,5 @@
 /**
- * mft.c - Miscellaneous functions. Part of the Linux-NTFS project.
+ * misc.c - Miscellaneous functions. Part of the Linux-NTFS project.
  *
  * Copyright (c) 2006 Szabolcs Szakacsits
  *