| Message ID | 1265002505-8387-17-git-send-email-aneesh.kumar@linux.vnet.ibm.com |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Mon, Feb 01, 2010 at 11:04:58AM +0530, Aneesh Kumar K.V wrote: > Update the incompat flag value so that we don't > conflict with ext4 features which are not yet > upstream but are in use. In general, for any patches that just fix problems in preceding patches, could you just fold those into the preceding patches? --b. > > > Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> > --- > fs/ext4/ext4.h | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h > index 13df624..bcbff59 100644 > --- a/fs/ext4/ext4.h > +++ b/fs/ext4/ext4.h > @@ -1133,7 +1133,9 @@ static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino) > #define EXT4_FEATURE_INCOMPAT_64BIT 0x0080 > #define EXT4_FEATURE_INCOMPAT_MMP 0x0100 > #define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200 > -#define EXT4_FEATURE_INCOMPAT_RICHACL 0x0400 > +#define EXT4_FEATURE_INCOMPAT_EA_INODE 0x0400 > +#define EXT4_FEATURE_INCOMPAT_RICHACL 0x0800 > +#define EXT4_FEATURE_INCOMPAT_DIRDATA 0x1000 > > #define EXT4_FEATURE_COMPAT_SUPP EXT2_FEATURE_COMPAT_EXT_ATTR > #define EXT4_FEATURE_INCOMPAT_SUPP (EXT4_FEATURE_INCOMPAT_FILETYPE| \ > -- > 1.7.0.rc0.48.gdace5 > -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 13df624..bcbff59 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -1133,7 +1133,9 @@ static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino) #define EXT4_FEATURE_INCOMPAT_64BIT 0x0080 #define EXT4_FEATURE_INCOMPAT_MMP 0x0100 #define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200 -#define EXT4_FEATURE_INCOMPAT_RICHACL 0x0400 +#define EXT4_FEATURE_INCOMPAT_EA_INODE 0x0400 +#define EXT4_FEATURE_INCOMPAT_RICHACL 0x0800 +#define EXT4_FEATURE_INCOMPAT_DIRDATA 0x1000 #define EXT4_FEATURE_COMPAT_SUPP EXT2_FEATURE_COMPAT_EXT_ATTR #define EXT4_FEATURE_INCOMPAT_SUPP (EXT4_FEATURE_INCOMPAT_FILETYPE| \
Update the incompat flag value so that we don't conflict with ext4 features which are not yet upstream but are in use. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> --- fs/ext4/ext4.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)