Message ID | 20200626032933.GT-b1mIKo%akpm@linux-foundation.org |
---|---|
State | New |
Headers | show |
Series | [merged] mm-memcontrol-fix-do-not-put-the-css-reference.patch removed from -mm tree | expand |
--- a/fs/ocfs2/ocfs2_fs.h~ocfs2-load-global_inode_alloc +++ a/fs/ocfs2/ocfs2_fs.h @@ -326,8 +326,8 @@ struct ocfs2_system_inode_info { enum { BAD_BLOCK_SYSTEM_INODE = 0, GLOBAL_INODE_ALLOC_SYSTEM_INODE, +#define OCFS2_FIRST_ONLINE_SYSTEM_INODE GLOBAL_INODE_ALLOC_SYSTEM_INODE SLOT_MAP_SYSTEM_INODE, -#define OCFS2_FIRST_ONLINE_SYSTEM_INODE SLOT_MAP_SYSTEM_INODE HEARTBEAT_SYSTEM_INODE, GLOBAL_BITMAP_SYSTEM_INODE, USER_QUOTA_SYSTEM_INODE,