Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / fs / xfs / xfs_super.h

diff --git a/fs/xfs/xfs_super.h b/fs/xfs/xfs_super.h
index 763e43d22deeffc20862742ccdb4c13cbdd0e796..b552cf6d3379849465a3a06f6919882504b9ae6e 100644 (file)
--- a/fs/xfs/xfs_super.h
+++ b/fs/xfs/xfs_super.h
@@ -11,9 +11,11 @@
 #ifdef CONFIG_XFS_QUOTA
 extern int xfs_qm_init(void);
 extern void xfs_qm_exit(void);
+# define XFS_QUOTA_STRING      "quota, "
 #else
 # define xfs_qm_init() (0)
 # define xfs_qm_exit() do { } while (0)
+# define XFS_QUOTA_STRING
 #endif
 
 #ifdef CONFIG_XFS_POSIX_ACL
@@ -50,6 +52,12 @@ extern void xfs_qm_exit(void);
 # define XFS_WARN_STRING
 #endif
 
+#ifdef CONFIG_XFS_ASSERT_FATAL
+# define XFS_ASSERT_FATAL_STRING       "fatal assert, "
+#else
+# define XFS_ASSERT_FATAL_STRING
+#endif
+
 #ifdef DEBUG
 # define XFS_DBG_STRING                "debug"
 #else
@@ -63,6 +71,8 @@ extern void xfs_qm_exit(void);
                                XFS_SCRUB_STRING \
                                XFS_REPAIR_STRING \
                                XFS_WARN_STRING \
+                               XFS_QUOTA_STRING \
+                               XFS_ASSERT_FATAL_STRING \
                                XFS_DBG_STRING /* DBG must be last */
 
 struct xfs_inode;