Inserted updated definitions of reparse tags into layout.h

Replace the obsolete definition of reparse tags in layout.h by the
current definitions from msdn, and use them in reparse.c instead of
redefining them.

diff --git a/include/ntfs-3g/layout.h b/include/ntfs-3g/layout.h
index c167135..427f152 100644 (file)
--- a/include/ntfs-3g/layout.h
+++ b/include/ntfs-3g/layout.h
@@ -2398,18 +2398,19 @@ typedef enum {
        IO_REPARSE_TAG_RESERVED_ONE     = const_cpu_to_le32(0x00000001),
        IO_REPARSE_TAG_RESERVED_RANGE   = const_cpu_to_le32(0x00000001),
 
-       IO_REPARSE_TAG_NSS              = const_cpu_to_le32(0x68000005),
-       IO_REPARSE_TAG_NSS_RECOVER      = const_cpu_to_le32(0x68000006),
-       IO_REPARSE_TAG_SIS              = const_cpu_to_le32(0x68000007),
-       IO_REPARSE_TAG_DFS              = const_cpu_to_le32(0x68000008),
-
-       IO_REPARSE_TAG_MOUNT_POINT      = const_cpu_to_le32(0x88000003),
-
-       IO_REPARSE_TAG_HSM              = const_cpu_to_le32(0xa8000004),
-
-       IO_REPARSE_TAG_SYMBOLIC_LINK    = const_cpu_to_le32(0xe8000000),
-
-       IO_REPARSE_TAG_VALID_VALUES     = const_cpu_to_le32(0xe000ffff),
+       IO_REPARSE_TAG_CSV              = const_cpu_to_le32(0x80000009),
+       IO_REPARSE_TAG_DEDUP            = const_cpu_to_le32(0x80000013),
+       IO_REPARSE_TAG_DFS              = const_cpu_to_le32(0x8000000A),
+       IO_REPARSE_TAG_DFSR             = const_cpu_to_le32(0x80000012),
+       IO_REPARSE_TAG_HSM              = const_cpu_to_le32(0xC0000004),
+       IO_REPARSE_TAG_HSM2             = const_cpu_to_le32(0x80000006),
+       IO_REPARSE_TAG_MOUNT_POINT      = const_cpu_to_le32(0xA0000003),
+       IO_REPARSE_TAG_NFS              = const_cpu_to_le32(0x80000014),
+       IO_REPARSE_TAG_SIS              = const_cpu_to_le32(0x80000007),
+       IO_REPARSE_TAG_SYMLINK          = const_cpu_to_le32(0xA000000C),
+       IO_REPARSE_TAG_WIM              = const_cpu_to_le32(0x80000008),
+
+       IO_REPARSE_TAG_VALID_VALUES     = const_cpu_to_le32(0xf000ffff),
 } PREDEFINED_REPARSE_TAGS;
 
 /**

diff --git a/libntfs-3g/reparse.c b/libntfs-3g/reparse.c
index 13b73f2..dc44bcd 100644 (file)
--- a/libntfs-3g/reparse.c
+++ b/libntfs-3g/reparse.c
@@ -49,6 +49,7 @@
 #include "compat.h"
 #include "types.h"
 #include "debug.h"
+#include "layout.h"
 #include "attrib.h"
 #include "inode.h"
 #include "dir.h"
@@ -60,18 +61,6 @@
 #include "misc.h"
 #include "reparse.h"
 
-/* the definitions in layout.h are wrong, we use names defined in
-  http://msdn.microsoft.com/en-us/library/aa365740(VS.85).aspx
-*/
-
-#define IO_REPARSE_TAG_DFS         const_cpu_to_le32(0x8000000A)
-#define IO_REPARSE_TAG_DFSR        const_cpu_to_le32(0x80000012)
-#define IO_REPARSE_TAG_HSM         const_cpu_to_le32(0xC0000004)
-#define IO_REPARSE_TAG_HSM2        const_cpu_to_le32(0x80000006)
-#define IO_REPARSE_TAG_MOUNT_POINT const_cpu_to_le32(0xA0000003)
-#define IO_REPARSE_TAG_SIS         const_cpu_to_le32(0x80000007)
-#define IO_REPARSE_TAG_SYMLINK     const_cpu_to_le32(0xA000000C)
-
 struct MOUNT_POINT_REPARSE_DATA {      /* reparse data for junctions */
        le16    subst_name_offset;
        le16    subst_name_length;