1 files changed, 79 insertions, 5 deletions

diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index df07e78487d5..65407f6c9120 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -278,6 +278,7 @@ typedef struct journal_superblock_s
 /* 0x0400 */
 } journal_superblock_t;
 
+/* Use the jbd2_{has,set,clear}_feature_* helpers; these will be removed */
 #define JBD2_HAS_COMPAT_FEATURE(j,mask)                                 \
         ((j)->j_format_version >= 2 &&                                  \
          ((j)->j_superblock->s_feature_compat & cpu_to_be32((mask))))
@@ -288,7 +289,7 @@ typedef struct journal_superblock_s
         ((j)->j_format_version >= 2 &&                                  \
          ((j)->j_superblock->s_feature_incompat & cpu_to_be32((mask))))
 
-#define JBD2_FEATURE_COMPAT_CHECKSUM    0x00000001
+#define JBD2_FEATURE_COMPAT_CHECKSUM            0x00000001
 
 #define JBD2_FEATURE_INCOMPAT_REVOKE            0x00000001
 #define JBD2_FEATURE_INCOMPAT_64BIT             0x00000002
@@ -296,6 +297,8 @@ typedef struct journal_superblock_s
 #define JBD2_FEATURE_INCOMPAT_CSUM_V2           0x00000008
 #define JBD2_FEATURE_INCOMPAT_CSUM_V3           0x00000010
 
+/* See "journal feature predicate functions" below */
+
 /* Features known to this kernel version: */
 #define JBD2_KNOWN_COMPAT_FEATURES      JBD2_FEATURE_COMPAT_CHECKSUM
 #define JBD2_KNOWN_ROCOMPAT_FEATURES    0
@@ -1034,6 +1037,69 @@ struct journal_s
         __u32 j_csum_seed;
 };
 
+/* journal feature predicate functions */
+#define JBD2_FEATURE_COMPAT_FUNCS(name, flagname) \
+static inline bool jbd2_has_feature_##name(journal_t *j) \
+{ \
+        return ((j)->j_format_version >= 2 && \
+                ((j)->j_superblock->s_feature_compat & \
+                 cpu_to_be32(JBD2_FEATURE_COMPAT_##flagname)) != 0); \
+} \
+static inline void jbd2_set_feature_##name(journal_t *j) \
+{ \
+        (j)->j_superblock->s_feature_compat |= \
+                cpu_to_be32(JBD2_FEATURE_COMPAT_##flagname); \
+} \
+static inline void jbd2_clear_feature_##name(journal_t *j) \
+{ \
+        (j)->j_superblock->s_feature_compat &= \
+                ~cpu_to_be32(JBD2_FEATURE_COMPAT_##flagname); \
+}
+
+#define JBD2_FEATURE_RO_COMPAT_FUNCS(name, flagname) \
+static inline bool jbd2_has_feature_##name(journal_t *j) \
+{ \
+        return ((j)->j_format_version >= 2 && \
+                ((j)->j_superblock->s_feature_ro_compat & \
+                 cpu_to_be32(JBD2_FEATURE_RO_COMPAT_##flagname)) != 0); \
+} \
+static inline void jbd2_set_feature_##name(journal_t *j) \
+{ \
+        (j)->j_superblock->s_feature_ro_compat |= \
+                cpu_to_be32(JBD2_FEATURE_RO_COMPAT_##flagname); \
+} \
+static inline void jbd2_clear_feature_##name(journal_t *j) \
+{ \
+        (j)->j_superblock->s_feature_ro_compat &= \
+                ~cpu_to_be32(JBD2_FEATURE_RO_COMPAT_##flagname); \
+}
+
+#define JBD2_FEATURE_INCOMPAT_FUNCS(name, flagname) \
+static inline bool jbd2_has_feature_##name(journal_t *j) \
+{ \
+        return ((j)->j_format_version >= 2 && \
+                ((j)->j_superblock->s_feature_incompat & \
+                 cpu_to_be32(JBD2_FEATURE_INCOMPAT_##flagname)) != 0); \
+} \
+static inline void jbd2_set_feature_##name(journal_t *j) \
+{ \
+        (j)->j_superblock->s_feature_incompat |= \
+                cpu_to_be32(JBD2_FEATURE_INCOMPAT_##flagname); \
+} \
+static inline void jbd2_clear_feature_##name(journal_t *j) \
+{ \
+        (j)->j_superblock->s_feature_incompat &= \
+                ~cpu_to_be32(JBD2_FEATURE_INCOMPAT_##flagname); \
+}
+
+JBD2_FEATURE_COMPAT_FUNCS(checksum,             CHECKSUM)
+
+JBD2_FEATURE_INCOMPAT_FUNCS(revoke,             REVOKE)
+JBD2_FEATURE_INCOMPAT_FUNCS(64bit,              64BIT)
+JBD2_FEATURE_INCOMPAT_FUNCS(async_commit,       ASYNC_COMMIT)
+JBD2_FEATURE_INCOMPAT_FUNCS(csum2,              CSUM_V2)
+JBD2_FEATURE_INCOMPAT_FUNCS(csum3,              CSUM_V3)
+
 /*
  * Journal flag definitions
  */
@@ -1046,6 +1112,7 @@ struct journal_s
 #define JBD2_ABORT_ON_SYNCDATA_ERR      0x040   /* Abort the journal on file
                                                  * data write error in ordered
                                                  * mode */
+#define JBD2_REC_ERR    0x080   /* The errno in the sb has been recorded */
 
 /*
  * Function declarations for the journaling transaction and buffer
@@ -1338,13 +1405,17 @@ static inline int tid_geq(tid_t x, tid_t y)
 extern int jbd2_journal_blocks_per_page(struct inode *inode);
 extern size_t journal_tag_bytes(journal_t *journal);
 
+static inline bool jbd2_journal_has_csum_v2or3_feature(journal_t *j)
+{
+        return jbd2_has_feature_csum2(j) || jbd2_has_feature_csum3(j);
+}
+
 static inline int jbd2_journal_has_csum_v2or3(journal_t *journal)
 {
-        if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V2) ||
-            JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V3))
-                return 1;
+        WARN_ON_ONCE(jbd2_journal_has_csum_v2or3_feature(journal) &&
+                     journal->j_chksum_driver == NULL);
 
-        return 0;
+        return journal->j_chksum_driver != NULL;
 }
 
 /*
@@ -1444,4 +1515,7 @@ static inline tid_t  jbd2_get_latest_transaction(journal_t *journal)
 
 #endif  /* __KERNEL__ */
 
+#define EFSBADCRC       EBADMSG         /* Bad CRC detected */
+#define EFSCORRUPTED    EUCLEAN         /* Filesystem is corrupted */
+
 #endif  /* _LINUX_JBD2_H */