AOSP: mke2fs, libext2fs: fix bugs on windows

[tools/e2fsprogs.git] / lib / ext2fs / ext2_ext_attr.h

diff --git a/lib/ext2fs/ext2_ext_attr.h b/lib/ext2fs/ext2_ext_attr.h
index 504f747..f2042ed 100644 (file)
--- a/lib/ext2fs/ext2_ext_attr.h
+++ b/lib/ext2fs/ext2_ext_attr.h
@@ -6,8 +6,11 @@
   (C) 2000 Andreas Gruenbacher, <a.gruenbacher@computer.org>
 */
 
+#ifndef _EXT2_EXT_ATTR_H
+#define _EXT2_EXT_ATTR_H
 /* Magic value in attribute blocks */
-#define EXT2_EXT_ATTR_MAGIC            0xEA010000
+#define EXT2_EXT_ATTR_MAGIC_v1         0xEA010000
+#define EXT2_EXT_ATTR_MAGIC            0xEA020000
 
 /* Maximum number of references to one attribute block */
 #define EXT2_EXT_ATTR_REFCOUNT_MAX     1024
@@ -17,21 +20,25 @@ struct ext2_ext_attr_header {
        __u32   h_refcount;     /* reference count */
        __u32   h_blocks;       /* number of disk blocks used */
        __u32   h_hash;         /* hash value of all attributes */
-       __u32   h_reserved[4];  /* zero right now */
+       __u32   h_checksum;     /* crc32c(uuid+id+xattrs) */
+                               /* id = inum if refcount = 1, else blknum */
+       __u32   h_reserved[3];  /* zero right now */
 };
 
 struct ext2_ext_attr_entry {
        __u8    e_name_len;     /* length of name */
-       __u8    e_name_index;   /* index into table of names (n/i) */
+       __u8    e_name_index;   /* attribute name index */
        __u16   e_value_offs;   /* offset in disk block of value */
-       __u32   e_value_block;  /* disk block attribute is stored on (n/i) */
+       __u32   e_value_inum;   /* inode in which the value is stored */
        __u32   e_value_size;   /* size of attribute value */
        __u32   e_hash;         /* hash value of name and value */
+#if 0
        char    e_name[0];      /* attribute name */
+#endif
 };
 
 #define EXT2_EXT_ATTR_PAD_BITS         2
-#define EXT2_EXT_ATTR_PAD              (1<<EXT2_EXT_ATTR_PAD_BITS)
+#define EXT2_EXT_ATTR_PAD              ((unsigned) 1<<EXT2_EXT_ATTR_PAD_BITS)
 #define EXT2_EXT_ATTR_ROUND            (EXT2_EXT_ATTR_PAD-1)
 #define EXT2_EXT_ATTR_LEN(name_len) \
        (((name_len) + EXT2_EXT_ATTR_ROUND + \
@@ -41,6 +48,14 @@ struct ext2_ext_attr_entry {
          (char *)(entry) + EXT2_EXT_ATTR_LEN((entry)->e_name_len)) )
 #define EXT2_EXT_ATTR_SIZE(size) \
        (((size) + EXT2_EXT_ATTR_ROUND) & ~EXT2_EXT_ATTR_ROUND)
+#define EXT2_EXT_IS_LAST_ENTRY(entry) (*((__u32 *)(entry)) == 0UL)
+#define EXT2_EXT_ATTR_NAME(entry) \
+       (((char *) (entry)) + sizeof(struct ext2_ext_attr_entry))
+#define EXT2_XATTR_LEN(name_len) \
+       (((name_len) + EXT2_EXT_ATTR_ROUND + \
+       sizeof(struct ext2_xattr_entry)) & ~EXT2_EXT_ATTR_ROUND)
+#define EXT2_XATTR_SIZE(size) \
+       (((size) + EXT2_EXT_ATTR_ROUND) & ~EXT2_EXT_ATTR_ROUND)
 
 #ifdef __KERNEL__
 # ifdef CONFIG_EXT2_FS_EXT_ATTR
@@ -55,4 +70,4 @@ extern void ext2_ext_attr_done(void);
 #  define ext2_set_ext_attr NULL
 # endif
 #endif  /* __KERNEL__ */
-
+#endif  /* _EXT2_EXT_ATTR_H */