[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c, 1.223, 1.224 dir.c, 1.66, 1.67

[Yuval <uv...@de...>]

Changes by: uvman

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

Modified Files:
	attrib.c dir.c 
Log Message:
[Inconstant,Damaged] metadata -> Inconsistent metadata

Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -p -r1.223 -r1.224
--- attrib.c	22 Oct 2006 01:11:48 -0000	1.223
+++ attrib.c	25 Oct 2006 18:57:15 -0000	1.224
@@ -1246,7 +1246,7 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 				if (ntfs_cluster_free_from_rl(vol, rlc)) {
 					ntfs_log_trace("Failed to free just "
 						"allocated clusters. Leaving "
-						"inconstant metadata. "
+						"inconsistent metadata. "
 						"Run chkdsk\n");
 				}
 				errno = eo;
@@ -2809,11 +2809,10 @@ int ntfs_non_resident_attr_record_add(nt
 					lowest_vcn, NULL, 0, ctx)) {
 		err = errno;
 		ntfs_log_trace("Attribute lookup failed. Probably leaving "
-				"inconstant metadata.\n");
+				"inconsistent metadata.\n");
 		ntfs_attr_put_search_ctx(ctx);
 		errno = err;
 		return -1;
-
 	}
 	offset = (u8*)ctx->attr - (u8*)ctx->mrec;
 	ntfs_attr_put_search_ctx(ctx);
@@ -2864,7 +2863,7 @@ int ntfs_attr_record_rm(ntfs_attr_search
 		if (NInoAttrList(base_ni) && type != AT_ATTRIBUTE_LIST)
 			if (ntfs_attrlist_entry_add(ni, ctx->attr))
 				ntfs_log_trace("Rollback failed. Leaving "
-						"inconstant metadata.\n");
+						"inconsistent metadata.\n");
 		err = EIO;
 		return -1;
 	}
@@ -3149,7 +3148,8 @@ add_attr_record:
 		ntfs_log_trace("Failed to initialize just added attribute.\n");
 		if (ntfs_attr_rm(na)) {
 			ntfs_log_trace("Failed to remove just added attribute. "
-					"Probably leaving damaged metadata.\n");
+					"Probably leaving inconsistent "
+					"metadata.\n");
 			ntfs_attr_close(na);
 		}
 		goto err_out;
@@ -3170,7 +3170,7 @@ free_err_out:
 			le32_to_cpu(attr_ni->mrec->attrs_offset) == 8) {
 		if (ntfs_mft_record_free(attr_ni->vol, attr_ni)) {
 			ntfs_log_trace("Failed to free MFT record. Leaving "
-					"inconstant metadata.\n");
+					"inconsistent metadata.\n");
 		}
 	}
 err_out:
@@ -3207,7 +3207,7 @@ int ntfs_attr_rm(ntfs_attr *na)
 			return -1;
 		if (ntfs_cluster_free(na->ni->vol, na, 0, -1) < 0) {
 			ntfs_log_trace("Failed to free cluster allocation. "
-					"Leaving inconstant metadata.\n");
+					"Leaving inconsistent metadata.\n");
 			ret = -1;
 		}
 	}
@@ -3220,14 +3220,14 @@ int ntfs_attr_rm(ntfs_attr *na)
 				CASE_SENSITIVE, 0, NULL, 0, ctx)) {
 		if (ntfs_attr_record_rm(ctx)) {
 			ntfs_log_trace("Failed to remove attribute extent. "
-					"Leaving inconstant metadata.\n");
+					"Leaving inconsistent metadata.\n");
 			ret = -1;
 		}
 		ntfs_attr_reinit_search_ctx(ctx);
 	}
 	if (errno != ENOENT) {
 		ntfs_log_trace("Attribute lookup failed. "
-				"Probably leaving inconstant metadata.\n");
+				"Probably leaving inconsistent metadata.\n");
 		ret = -1;
 	}
 
@@ -4067,7 +4067,7 @@ static int ntfs_attr_make_resident(ntfs_
 		if (bytes_read >= 0)
 			errno = EIO;
 		ntfs_log_trace("Eeek! Failed to read attribute data. Leaving "
-				"inconstant metadata. Run chkdsk.  "
+				"inconsistent metadata. Run chkdsk.  "
 				"Aborting...\n");
 		return -1;
 	}
@@ -4327,8 +4327,9 @@ retry:
 						na->ni->vol, na->rl);
 				if (new_compr_size == -1) {
 					err = errno;
-					ntfs_log_trace("BUG! Leaving inconstant"
-							" metadata.\n");
+					ntfs_log_trace("BUG! Leaving "
+							"inconsistent "
+							"metadata.\n");
 					goto put_err_out;
 				}
 				na->compressed_size = new_compr_size;
@@ -4646,7 +4647,7 @@ static int ntfs_non_resident_attr_shrink
 		/* Write mapping pairs for new runlist. */
 		if (ntfs_attr_update_mapping_pairs(na, 0 /*first_free_vcn*/)) {
 			ntfs_log_trace("Eeek! Mapping pairs update failed. "
-					"Leaving inconstant metadata. "
+					"Leaving inconsistent metadata. "
 					"Run chkdsk.\n");
 			return -1;
 		}
@@ -4664,7 +4665,7 @@ static int ntfs_non_resident_attr_shrink
 		if (err == ENOENT)
 			err = EIO;
 		ntfs_log_trace("Eeek! Lookup of first attribute extent failed. "
-				"Leaving inconstant metadata.\n");
+				"Leaving inconsistent metadata.\n");
 		goto put_err_out;
 	}
 

Index: dir.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- dir.c	22 Oct 2006 00:23:29 -0000	1.66
+++ dir.c	25 Oct 2006 18:57:15 -0000	1.67
@@ -1622,13 +1622,15 @@ search:
 			if (!rl) {
 				err = errno;
 				ntfs_log_error("Failed to decompress runlist.  "
-						"Leaving damaged metadata.\n");
+						"Leaving inconsistent "
+						"metadata.\n");
 				continue;
 			}
 			if (ntfs_cluster_free_from_rl(ni->vol, rl)) {
 				err = errno;
 				ntfs_log_error("Failed to free clusters.  "
-						"Leaving damaged metadata.\n");
+						"Leaving inconsistent "
+						"metadata.\n");
 				continue;
 			}
 			free(rl);