[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.218,1.219

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

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357.server4you.de:/tmp/cvs-serv20020/libntfs

Modified Files:
	attrib.c 
Log Message:
Prevent index root to be moved out from base mft record


Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -p -r1.218 -r1.219
--- attrib.c	2 Aug 2006 03:12:34 -0000	1.218
+++ attrib.c	2 Aug 2006 03:57:40 -0000	1.219
@@ -3731,9 +3731,13 @@ cluster_free_err_out:
  *
  * On success return 0 and on error return -1 with errno set to the error code.
  * The following error codes are defined:
- *	ENOMEM - Not enough memory to complete operation.
- *	ERANGE - @newsize is not valid for the attribute type of @na.
- *	ENOSPC - There is no enough space in base mft to resize $ATTRIBUTE_LIST.
+ *	ENOMEM		- Not enough memory to complete operation.
+ *	ERANGE		- @newsize is not valid for the attribute type of @na.
+ *	ENOSPC		- There is no enough space on the volume to allocate
+ *			  new clusters or in base mft to resize $ATTRIBUTE_LIST.
+ *	EOVERFLOW	- Resident attribute can not become non resident and
+ *			  already filled whole MFT record, but had not reached
+ *			  @newsize bytes length.
  */
 static int ntfs_resident_attr_resize(ntfs_attr *na, const s64 newsize)
 {
@@ -3883,6 +3887,22 @@ static int ntfs_resident_attr_resize(ntf
 		goto put_err_out;
 	}
 
+	/* 
+	 * Force index allocation creation instead of moving out index root
+	 * from the base MFT record.
+	 */
+	if (na->type == AT_INDEX_ROOT && na->data_size > sizeof(INDEX_ROOT) +
+			sizeof(INDEX_ENTRY_HEADER) + sizeof(VCN)) {
+		INDEX_ROOT *ir;
+
+		ir = (INDEX_ROOT*)((u8*)ctx->attr +
+				le16_to_cpu(ctx->attr->value_offset));
+		if (!(ir->index.flags & LARGE_INDEX)) {
+			err = EOVERFLOW;
+			goto put_err_out;
+		}
+	}
+
 	/*
 	 * Check whether attribute is already single in the this MFT record.
 	 * 8 added for the attribute terminator.
@@ -3890,7 +3910,7 @@ static int ntfs_resident_attr_resize(ntf
 	if (le32_to_cpu(ctx->mrec->bytes_in_use) ==
 			le16_to_cpu(ctx->mrec->attrs_offset) +
 			le32_to_cpu(ctx->attr->length) + 8) {
-		err = ENOSPC;
+		err = EOVERFLOW;
 		goto put_err_out;
 	}
 
@@ -4960,8 +4980,15 @@ put_err_out:
  *
  * On success return 0 and on error return -1 with errno set to the error code.
  * The following error codes are defined:
- *	EINVAL	   - Invalid arguments were passed to the function.
- *	EOPNOTSUPP - The desired resize is not implemented yet.
+ *	EINVAL	   	- Invalid arguments were passed to the function.
+ *	EACCES		- Attribute is encrypted.
+ *	ERANGE		- @newsize is not valid for the attribute type of @na.
+ *	ENOSPC		- There is no enough space on the volume to allocate
+ *			  new clusters or in base mft to resize $ATTRIBUTE_LIST.
+ *	EOVERFLOW	- Resident attribute can not become non resident and
+ *			  already filled whole MFT record, but had not reached
+ *			  @newsize bytes length.
+ *	EOPNOTSUPP	- The desired resize is not implemented yet.
  */
 int ntfs_attr_truncate(ntfs_attr *na, const s64 newsize)
 {