diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-12-24 11:04:08 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-24 11:04:08 +0100 |
commit | 7645c4bfbb36f357f03815f5729c46ce8d89f008 (patch) | |
tree | eb2c45bbdfc715a9a6e96e6af9675a0440ef8ff1 /fs/ocfs2/ocfs2_fs.h | |
parent | 74b7ff48a93f44198ac03cc4e628d713f53d4668 (diff) | |
parent | 574f3c4f5c55e99ea60f71fd98cc54931d4b2eae (diff) | |
download | op-kernel-dev-7645c4bfbb36f357f03815f5729c46ce8d89f008.zip op-kernel-dev-7645c4bfbb36f357f03815f5729c46ce8d89f008.tar.gz |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'fs/ocfs2/ocfs2_fs.h')
-rw-r--r-- | fs/ocfs2/ocfs2_fs.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/ocfs2/ocfs2_fs.h b/fs/ocfs2/ocfs2_fs.h index 5f180cf..5e0c0d0 100644 --- a/fs/ocfs2/ocfs2_fs.h +++ b/fs/ocfs2/ocfs2_fs.h @@ -86,7 +86,8 @@ #define OCFS2_CLEAR_INCOMPAT_FEATURE(sb,mask) \ OCFS2_SB(sb)->s_feature_incompat &= ~(mask) -#define OCFS2_FEATURE_COMPAT_SUPP OCFS2_FEATURE_COMPAT_BACKUP_SB +#define OCFS2_FEATURE_COMPAT_SUPP (OCFS2_FEATURE_COMPAT_BACKUP_SB \ + | OCFS2_FEATURE_COMPAT_JBD2_SB) #define OCFS2_FEATURE_INCOMPAT_SUPP (OCFS2_FEATURE_INCOMPAT_LOCAL_MOUNT \ | OCFS2_FEATURE_INCOMPAT_SPARSE_ALLOC \ | OCFS2_FEATURE_INCOMPAT_INLINE_DATA \ @@ -153,6 +154,11 @@ #define OCFS2_FEATURE_COMPAT_BACKUP_SB 0x0001 /* + * The filesystem will correctly handle journal feature bits. + */ +#define OCFS2_FEATURE_COMPAT_JBD2_SB 0x0002 + +/* * Unwritten extents support. */ #define OCFS2_FEATURE_RO_COMPAT_UNWRITTEN 0x0001 |