Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / fs / ocfs2 / ocfs2_fs.h

diff --git a/fs/ocfs2/ocfs2_fs.h b/fs/ocfs2/ocfs2_fs.h
index af0013b9c17f74864b4612f395a5b9c411734046..c7ae45aaa36cd5fa9bc8644dc92ab36a3d6aea55 100644 (file)
--- a/fs/ocfs2/ocfs2_fs.h
+++ b/fs/ocfs2/ocfs2_fs.h
@@ -94,7 +94,8 @@
                                         | OCFS2_FEATURE_INCOMPAT_INLINE_DATA \
                                         | OCFS2_FEATURE_INCOMPAT_EXTENDED_SLOT_MAP \
                                         | OCFS2_FEATURE_INCOMPAT_USERSPACE_STACK \
-                                        | OCFS2_FEATURE_INCOMPAT_XATTR)
+                                        | OCFS2_FEATURE_INCOMPAT_XATTR \
+                                        | OCFS2_FEATURE_INCOMPAT_META_ECC)
 #define OCFS2_FEATURE_RO_COMPAT_SUPP   (OCFS2_FEATURE_RO_COMPAT_UNWRITTEN \
                                         | OCFS2_FEATURE_RO_COMPAT_USRQUOTA \
                                         | OCFS2_FEATURE_RO_COMPAT_GRPQUOTA)
@@ -776,7 +777,7 @@ struct ocfs2_dir_block_trailer {
 /*20*/ __le64          db_blkno;               /* Offset on disk, in blocks */
        __le64          db_parent_dinode;       /* dinode which owns me, in
                                                   blocks */
-/*30*/ __le64          db_check;               /* Error checking */
+/*30*/ struct ocfs2_block_check db_check;      /* Error checking */
 /*40*/
 };