redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
alistair/sunxi64-5.5-dsi
Darrick J. Wong 2019-11-02 09:41:19 -07:00
parent 110f09cb70
commit 9842b56cd4
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/xfs/xfs_linux.h
View File

@ -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 */

16
fs/xfs/xfs_message.c
View File

@ -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();

4
fs/xfs/xfs_message.h
View File

@ -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);