1 files changed, 47 insertions, 36 deletions

diff --git a/fs/ntfs/layout.h b/fs/ntfs/layout.h
index 47b33899992..609ad1728ce 100644
--- a/fs/ntfs/layout.h
+++ b/fs/ntfs/layout.h
@@ -2,7 +2,7 @@
  * layout.h - All NTFS associated on-disk structures. Part of the Linux-NTFS
  *            project.
  *
- * Copyright (c) 2001-2004 Anton Altaparmakov
+ * Copyright (c) 2001-2005 Anton Altaparmakov
  * Copyright (c) 2002 Richard Russon
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -547,26 +547,44 @@ enum {
         COLLATION_NTOFS_ULONG           = const_cpu_to_le32(0x10),
         COLLATION_NTOFS_SID             = const_cpu_to_le32(0x11),
         COLLATION_NTOFS_SECURITY_HASH   = const_cpu_to_le32(0x12),
-        COLLATION_NTOFS_ULONGS          = const_cpu_to_le32(0x13)
+        COLLATION_NTOFS_ULONGS          = const_cpu_to_le32(0x13),
 };
 
 typedef le32 COLLATION_RULE;
 
 /*
  * The flags (32-bit) describing attribute properties in the attribute
- * definition structure.  FIXME: This information is from Regis's information
- * and, according to him, it is not certain and probably incomplete.
- * The INDEXABLE flag is fairly certainly correct as only the file name
- * attribute has this flag set and this is the only attribute indexed in NT4.
+ * definition structure.  FIXME: This information is based on Regis's
+ * information and, according to him, it is not certain and probably
+ * incomplete.  The INDEXABLE flag is fairly certainly correct as only the file
+ * name attribute has this flag set and this is the only attribute indexed in
+ * NT4.
  */
 enum {
-        INDEXABLE           = const_cpu_to_le32(0x02), /* Attribute can be
-                                                          indexed. */
-        NEED_TO_REGENERATE  = const_cpu_to_le32(0x40), /* Need to regenerate
-                                                          during regeneration
-                                                          phase. */
-        CAN_BE_NON_RESIDENT = const_cpu_to_le32(0x80), /* Attribute can be
-                                                          non-resident. */
+        ATTR_DEF_INDEXABLE      = const_cpu_to_le32(0x02), /* Attribute can be
+                                        indexed. */
+        ATTR_DEF_MULTIPLE       = const_cpu_to_le32(0x04), /* Attribute type
+                                        can be present multiple times in the
+                                        mft records of an inode. */
+        ATTR_DEF_NOT_ZERO       = const_cpu_to_le32(0x08), /* Attribute value
+                                        must contain at least one non-zero
+                                        byte. */
+        ATTR_DEF_INDEXED_UNIQUE = const_cpu_to_le32(0x10), /* Attribute must be
+                                        indexed and the attribute value must be
+                                        unique for the attribute type in all of
+                                        the mft records of an inode. */
+        ATTR_DEF_NAMED_UNIQUE   = const_cpu_to_le32(0x20), /* Attribute must be
+                                        named and the name must be unique for
+                                        the attribute type in all of the mft
+                                        records of an inode. */
+        ATTR_DEF_RESIDENT       = const_cpu_to_le32(0x40), /* Attribute must be
+                                        resident. */
+        ATTR_DEF_ALWAYS_LOG     = const_cpu_to_le32(0x80), /* Always log
+                                        modifications to this attribute,
+                                        regardless of whether it is resident or
+                                        non-resident.  Without this, only log
+                                        modifications if the attribute is
+                                        resident. */
 };
 
 typedef le32 ATTR_DEF_FLAGS;
@@ -749,10 +767,11 @@ typedef struct {
                                 record header aligned to 8-byte boundary. */
 /* 34*/                 u8 compression_unit; /* The compression unit expressed
                                 as the log to the base 2 of the number of
-                                clusters in a compression unit. 0 means not
-                                compressed. (This effectively limits the
+                                clusters in a compression unit.  0 means not
+                                compressed.  (This effectively limits the
                                 compression unit size to be a power of two
-                                clusters.) WinNT4 only uses a value of 4. */
+                                clusters.)  WinNT4 only uses a value of 4.
+                                Sparse files also have this set to 4. */
 /* 35*/                 u8 reserved[5];         /* Align to 8-byte boundary. */
 /* The sizes below are only used when lowest_vcn is zero, as otherwise it would
    be difficult to keep them up-to-date.*/
@@ -772,10 +791,10 @@ typedef struct {
                                 data_size. */
 /* sizeof(uncompressed attr) = 64*/
 /* 64*/                 sle64 compressed_size;  /* Byte size of the attribute
-                                value after compression. Only present when
-                                compressed. Always is a multiple of the
-                                cluster size. Represents the actual amount of
-                                disk space being used on the disk. */
+                                value after compression.  Only present when
+                                compressed or sparse.  Always is a multiple of
+                                the cluster size.  Represents the actual amount
+                                of disk space being used on the disk. */
 /* sizeof(compressed attr) = 72*/
                 } __attribute__ ((__packed__)) non_resident;
         } __attribute__ ((__packed__)) data;
@@ -834,7 +853,7 @@ enum {
         /* Note, this is a copy of the corresponding bit from the mft record,
            telling us whether this file has a view index present (eg. object id
            index, quota index, one of the security indexes or the encrypting
-           file system related indexes). */
+           filesystem related indexes). */
 };
 
 typedef le32 FILE_ATTR_FLAGS;
@@ -917,20 +936,12 @@ typedef struct {
                 /* 56*/ le64 quota_charged;     /* Byte size of the charge to
                                 the quota for all streams of the file. Note: Is
                                 zero if quotas are disabled. */
-                /* 64*/ le64 usn;               /* Last update sequence number
-                                of the file. This is a direct index into the
-                                change (aka usn) journal file. It is zero if
-                                the usn journal is disabled.
-                                NOTE: To disable the journal need to delete
-                                the journal file itself and to then walk the
-                                whole mft and set all Usn entries in all mft
-                                records to zero! (This can take a while!)
-                                The journal is FILE_Extend/$UsnJrnl. Win2k
-                                will recreate the journal and initiate
-                                logging if necessary when mounting the
-                                partition. This, in contrast to disabling the
-                                journal is a very fast process, so the user
-                                won't even notice it. */
+                /* 64*/ leUSN usn;              /* Last update sequence number
+                                of the file.  This is a direct index into the
+                                transaction log file ($UsnJrnl).  It is zero if
+                                the usn journal is disabled or this file has
+                                not been subject to logging yet.  See usnjrnl.h
+                                for details. */
                 } __attribute__ ((__packed__)) v3;
         /* sizeof() = 72 bytes (NTFS 3.x) */
         } __attribute__ ((__packed__)) ver;
@@ -1893,7 +1904,7 @@ enum {
         VOLUME_FLAGS_MASK               = const_cpu_to_le16(0x803f),
 
         /* To make our life easier when checking if we must mount read-only. */
-        VOLUME_MUST_MOUNT_RO_MASK       = const_cpu_to_le16(0x8037),
+        VOLUME_MUST_MOUNT_RO_MASK       = const_cpu_to_le16(0x8027),
 } __attribute__ ((__packed__));
 
 typedef le16 VOLUME_FLAGS;