From f1c3d697c9a719f771e9b96b7bf3bbab331ad350 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Mon, 20 Feb 2012 17:53:01 -0500 Subject: [PATCH] --- yaml --- r: 296535 b: refs/heads/master c: 856cbcf9a971b43a83e78ac708ed6459ab1d0c89 h: refs/heads/master i: 296533: 52e0465aa0f4b791dd7e389aef5cb45fbc347b6f 296531: cda92d8820ddee36bc6eada48dca241cfa684e56 296527: 1c074f7a643fac009cadbbce1b0e2cff717fcd3f v: v3 --- [refs] | 2 +- trunk/fs/ext4/ext4.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e304fd26b6fd..05f37ec3462b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2201c590dd6e802795e21e69e3c152c519f1568e +refs/heads/master: 856cbcf9a971b43a83e78ac708ed6459ab1d0c89 diff --git a/trunk/fs/ext4/ext4.h b/trunk/fs/ext4/ext4.h index 315f01be73e6..c2314dcbe4fb 100644 --- a/trunk/fs/ext4/ext4.h +++ b/trunk/fs/ext4/ext4.h @@ -1420,8 +1420,9 @@ static inline void ext4_clear_state_flags(struct ext4_inode_info *ei) #define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200 #define EXT4_FEATURE_INCOMPAT_EA_INODE 0x0400 /* EA in inode */ #define EXT4_FEATURE_INCOMPAT_DIRDATA 0x1000 /* data in dirent */ -#define EXT4_FEATURE_INCOMPAT_INLINEDATA 0x2000 /* data in inode */ +#define EXT4_FEATURE_INCOMPAT_BG_USE_META_CSUM 0x2000 /* use crc32c for bg */ #define EXT4_FEATURE_INCOMPAT_LARGEDIR 0x4000 /* >2GB or 3-lvl htree */ +#define EXT4_FEATURE_INCOMPAT_INLINEDATA 0x8000 /* data in inode */ #define EXT2_FEATURE_COMPAT_SUPP EXT4_FEATURE_COMPAT_EXT_ATTR #define EXT2_FEATURE_INCOMPAT_SUPP (EXT4_FEATURE_INCOMPAT_FILETYPE| \