xfs: make the assertion message functions take a mount parameter (9842b56c) · Commits · 戴 / test

fs/xfs/xfs_linux.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -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 */

+12 −4

Original line number	Diff line number	Diff line
		@@ -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();

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);