Merge branch 'maint' into next

[tools/e2fsprogs.git] / lib / ext2fs / kernel-jbd.h

diff --git a/lib/ext2fs/kernel-jbd.h b/lib/ext2fs/kernel-jbd.h
index 130c3a2..a9cdc30 100644 (file)
--- a/lib/ext2fs/kernel-jbd.h
+++ b/lib/ext2fs/kernel-jbd.h
@@ -186,6 +186,9 @@ struct journal_revoke_tail {
 #define JFS_FLAG_LAST_TAG      8       /* last tag in this descriptor block */
 
 
+#define UUID_SIZE 16
+#define JFS_USERS_MAX 48
+#define JFS_USERS_SIZE (UUID_SIZE * JFS_USERS_MAX)
 /*
  * The journal superblock.  All fields are in big-endian byte order.
  */
@@ -233,7 +236,8 @@ typedef struct journal_superblock_s
        __u32   s_checksum;             /* crc32c(superblock) */
 
 /* 0x0100 */
-       __u8    s_users[16*48];         /* ids of all fs'es sharing the log */
+       __u8    s_users[JFS_USERS_SIZE];                /* ids of all fs'es sharing the log */
+
 /* 0x0400 */
 } journal_superblock_t;