[Linux-NTFS-cvs] CVS: linux-ntfs/include layout.h,1.6,1.7

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

Changes by: antona

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

Modified Files:
	layout.h 
Log Message:
And some more mkntfs + some updates to layout.h concerning directories and
alignment requirements.


Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/layout.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- layout.h	2001/06/04 14:04:30	1.6
+++ layout.h	2001/06/06 22:55:49	1.7
@@ -1702,9 +1702,11 @@
  */
 typedef struct {
-	__u32 entries_offset;		/* Byte offset to first INDEX_ENTRY. */
+	__u32 entries_offset;		/* Byte offset to first INDEX_ENTRY
+					   aligned to 8-byte boundary. */
 	__u32 index_length;		/* Data size of the index in bytes,
 					   i.e. bytes used from allocated
-					   size. */
-	__u32 allocated_size;		/* Byte size of this index (block). */
+					   size, aligned to 8-byte boundary. */
+	__u32 allocated_size;		/* Byte size of this index (block),
+					   multiple of 8 bytes. */
 	/* NOTE: For the index root attribute, the above two numbers are always
 	   equal, as the attribute is resident and it is resized as needed. In
@@ -1900,7 +1902,9 @@
 		} __attribute__ ((__packed__));
 	} __attribute__ ((__packed__));
-/*  8*/	__u16 length;		 /* Byte size of this index entry. */
+/*  8*/	__u16 length;		 /* Byte size of this index entry, multiple of
+				    8-bytes. */
 /* 10*/	__u16 key_length;	 /* Byte size of the key value, which is in the
-				    index entry. It follows field reserved. */
+				    index entry. It follows field reserved. Not
+				    multiple of 8-bytes. */
 /* 12*/	INDEX_ENTRY_FLAGS flags; /* Bit field of INDEX_ENTRY_* flags. */
 /* 14*/	__u16 reserved;		 /* Reserved/align to 8-byte boundary. */
@@ -1922,5 +1926,5 @@
 			   FILE_NAME_ATTR. On NTFS 3.0+ the following
 			   additional index keys are defined: */
-		FILE_NAME_ATTR filename;/* $I30 index in directories. */
+		FILE_NAME_ATTR file_name;/* $I30 index in directories. */
 		SII_INDEX_KEY sii;	/* $SII index in $Secure. */
 		SDH_INDEX_KEY sdh;	/* $SDH index in $Secure. */