[Linux-NTFS-cvs] CVS: linux-ntfs/include attrib.h,1.11,1.12

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

Changes by: antona

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

Modified Files:
	attrib.h 
Log Message:
Fixes.


Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** attrib.h	2001/03/03 06:52:39	1.11
--- attrib.h	2001/03/04 14:28:13	1.12
***************
*** 964,970 ****
   */
  typedef struct {
! 	ACE_HEADER header;	/* The ACE_HEADER. */
  	ACCESS_MASK mask;	/* Access mask associated with the ACE. */
! 	__u32 sid_offset;	/* Offset to the SID associated with the ACE. */
  } __attribute__ ((__packed__)) ACCESS_ALLOWED_ACE, ACCESS_DENIED_ACE,
  			       SYSTEM_AUDIT_ACE, SYSTEM_ALARM_ACE;
--- 964,970 ----
   */
  typedef struct {
! 	ACE_HEADER header;	/* The ACE header. */
  	ACCESS_MASK mask;	/* Access mask associated with the ACE. */
! 	SID sid;		/* The SID associated with the ACE. */
  } __attribute__ ((__packed__)) ACCESS_ALLOWED_ACE, ACCESS_DENIED_ACE,
  			       SYSTEM_AUDIT_ACE, SYSTEM_ALARM_ACE;
***************
*** 984,988 ****
  	GUID object_type;
  	GUID inherited_object_type;
! 	__u32 sid_offset;	/* Offset to the SID associated with the ACE. */
  } __attribute__ ((__packed__)) ACCESS_ALLOWED_OBJECT_ACE,
  			       ACCESS_DENIED_OBJECT_ACE,
--- 984,988 ----
  	GUID object_type;
  	GUID inherited_object_type;
! 	SID sid;		/* The SID associated with the ACE. */
  } __attribute__ ((__packed__)) ACCESS_ALLOWED_OBJECT_ACE,
  			       ACCESS_DENIED_OBJECT_ACE,
***************
*** 1211,1224 ****
  	__u32 security_id; /* The security_id assigned to the descriptor. */
  	__u64 offset;	   /* Byte offset of this entry in the $SDS stream. */
! 	__u32 length;	   /* Size in bytes of this entry. */
  } __attribute__ ((__packed__)) SECURITY_DESCRIPTOR_HEADER;
  
  /*
!  * The $SDS data stream contains the security descriptors, aligned on 32-bit
   * boundaries, sorted by security_id in a B+ tree. Security descriptors cannot
   * cross 256kib boundaries (this restriction is imposed by the Windows cache
   * manager). Each security descriptor is contained in a SDS_ENTRY structure.
   * Also, each security descriptor is stored twice in the $SDS stream with a
!  * fixed offset of ??? bytes between them.
   */
  typedef struct {
--- 1211,1227 ----
  	__u32 security_id; /* The security_id assigned to the descriptor. */
  	__u64 offset;	   /* Byte offset of this entry in the $SDS stream. */
! 	__u32 length;	   /* Size in bytes of this entry in $SDS stream. */
  } __attribute__ ((__packed__)) SECURITY_DESCRIPTOR_HEADER;
  
  /*
!  * The $SDS data stream contains the security descriptors, aligned on 16-byte
   * boundaries, sorted by security_id in a B+ tree. Security descriptors cannot
   * cross 256kib boundaries (this restriction is imposed by the Windows cache
   * manager). Each security descriptor is contained in a SDS_ENTRY structure.
   * Also, each security descriptor is stored twice in the $SDS stream with a
!  * fixed offset of 0x40000 bytes (256kib, the Windows cache manager's max size)
!  * between them; i.e. if a SDS_ENTRY specifies an offset of 0x51d0, then the
!  * the first copy of the security descriptor will be at offset 0x51d0 in the
!  * $SDS data stream and the second copy will be at offset 0x451d0.
   */
  typedef struct {
***************
*** 1351,1357 ****
   */
  typedef struct {
! 	ATTRIBUTE_TYPE type;		/* Type of the indexed attribute. */
  	COLLATION_RULE collation_rule;	/* Collation rule used to sort the
! 					   index entries. */
  	__u32 bytes_per_index_block;	/* Byte size of each index block (in
  					   the index allocation attribute). */
--- 1354,1364 ----
   */
  typedef struct {
! 	ATTRIBUTE_TYPE type;		/* Type of the indexed attribute. Is
! 					   $FILENAME for directories, zero
! 					   for view indexes. No other values
! 					   allowed. */
  	COLLATION_RULE collation_rule;	/* Collation rule used to sort the
! 					   index entries. If type is $FILENAME,
! 					   this must be COLLATION_FILENAME. */
  	__u32 bytes_per_index_block;	/* Byte size of each index block (in
  					   the index allocation attribute). */
***************
*** 1363,1367 ****
  					   the mft record size and the index
  					   record size found in the boot sector
! 					   work). */
  	__u8 reserved[3];		/* Reserved/align to 8-byte boundary. */
  	INDEX_HEADER index;		/* Index header describing the
--- 1370,1374 ----
  					   the mft record size and the index
  					   record size found in the boot sector
! 					   work). Has to be a power of 2. */
  	__u8 reserved[3];		/* Reserved/align to 8-byte boundary. */
  	INDEX_HEADER index;		/* Index header describing the
***************
*** 1599,1605 ****
  } __attribute__ ((__packed__)) EA_INFORMATION;
  
! //typedef enum {
! //	NEED_EA	= ???;
! //} EA_FLAGS;
  
  /*
--- 1606,1615 ----
  } __attribute__ ((__packed__)) EA_INFORMATION;
  
! /*
!  * Extended attribute flags (8-bit).
!  */
! typedef enum {
! 	NEED_EA	= 0x80;
! } __attribute__ ((__packed__)) EA_FLAGS;
  
  /*
***************
*** 1613,1617 ****
  typedef struct {
  	__u32 next_entry_offset;	/* Offset to the next EA_ATTRIBUTE. */
! 	__u8 flags;			/* Bit array of EA_FLAGS. */
  	__u8 ea_name_length;		/* Length of the name of the extended
  					   attribute in bytes. */
--- 1623,1627 ----
  typedef struct {
  	__u32 next_entry_offset;	/* Offset to the next EA_ATTRIBUTE. */
! 	EA_FLAGS flags;			/* Flags describing the EA. */
  	__u8 ea_name_length;		/* Length of the name of the extended
  					   attribute in bytes. */
***************
*** 1629,1633 ****
   */
  typedef struct {
! 	/* ??? */
  } __attribute__ ((__packed__)) PROPERTY_SET;
  
--- 1639,1643 ----
   */
  typedef struct {
! 	/* Irrelevant as feature unused. */
  } __attribute__ ((__packed__)) PROPERTY_SET;