xfs: make the assertion message functions take a mount parameter

Make the assfail and asswarn functions take a struct xfs_mount so that
we can start tying debugging and corruption messages to a particular
mount.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
index ca15105681cacb7c3677b2397baf729ca846d47c..2271db4e8d661893c1894a80a90d7341bd22d487 100644 (file)
--- a/fs/xfs/xfs_linux.h
+++ b/fs/xfs/xfs_linux.h
@@ -223,18 +223,18 @@ int xfs_rw_bdev(struct block_device *bdev, sector_t sector, unsigned int count,
                char *data, unsigned int op);
 
 #define ASSERT_ALWAYS(expr)    \
-       (likely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))
+       (likely(expr) ? (void)0 : assfail(NULL, #expr, __FILE__, __LINE__))
 
 #ifdef DEBUG
 #define ASSERT(expr)   \
-       (likely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))
+       (likely(expr) ? (void)0 : assfail(NULL, #expr, __FILE__, __LINE__))
 
 #else  /* !DEBUG */
 
 #ifdef XFS_WARN
 
 #define ASSERT(expr)   \
-       (likely(expr) ? (void)0 : asswarn(#expr, __FILE__, __LINE__))
+       (likely(expr) ? (void)0 : asswarn(NULL, #expr, __FILE__, __LINE__))
 
 #else  /* !DEBUG && !XFS_WARN */
 

diff --git a/fs/xfs/xfs_message.c b/fs/xfs/xfs_message.c
index 21451c62cd1afa353fd53d93b05ce5204b005b28..e0f9d3b6abe90468caf77cab04ed7f986e537380 100644 (file)
--- a/fs/xfs/xfs_message.c
+++ b/fs/xfs/xfs_message.c
@@ -86,17 +86,25 @@ xfs_alert_tag(
 }
 
 void
-asswarn(char *expr, char *file, int line)
+asswarn(
+       struct xfs_mount        *mp,
+       char                    *expr,
+       char                    *file,
+       int                     line)
 {
-       xfs_warn(NULL, "Assertion failed: %s, file: %s, line: %d",
+       xfs_warn(mp, "Assertion failed: %s, file: %s, line: %d",
                expr, file, line);
        WARN_ON(1);
 }
 
 void
-assfail(char *expr, char *file, int line)
+assfail(
+       struct xfs_mount        *mp,
+       char                    *expr,
+       char                    *file,
+       int                     line)
 {
-       xfs_emerg(NULL, "Assertion failed: %s, file: %s, line: %d",
+       xfs_emerg(mp, "Assertion failed: %s, file: %s, line: %d",
                expr, file, line);
        if (xfs_globals.bug_on_assert)
                BUG();

diff --git a/fs/xfs/xfs_message.h b/fs/xfs/xfs_message.h
index 7f040b04b7393baea3b070ca0b4353b5b2acab2e..0b05e10995a085fc991b6fb592fad711481a39eb 100644 (file)
--- a/fs/xfs/xfs_message.h
+++ b/fs/xfs/xfs_message.h
@@ -57,8 +57,8 @@ do {                                                                  \
 #define xfs_debug_ratelimited(dev, fmt, ...)                           \
        xfs_printk_ratelimited(xfs_debug, dev, fmt, ##__VA_ARGS__)
 
-extern void assfail(char *expr, char *f, int l);
-extern void asswarn(char *expr, char *f, int l);
+void assfail(struct xfs_mount *mp, char *expr, char *f, int l);
+void asswarn(struct xfs_mount *mp, char *expr, char *f, int l);
 
 extern void xfs_hex_dump(const void *p, int length);