From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org, hch@infradead.org, david@fromorbit.org
Subject: [PATCH 1/3] xfs: add a if_xfs_meta_bad macro for testing and logging bad metadata
Date: Sun, 10 Nov 2019 17:17:58 -0800 [thread overview]
Message-ID: <157343507829.1945685.13191379852906635565.stgit@magnolia> (raw)
In-Reply-To: <157343507145.1945685.2940312466469213044.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
Add a new macro, if_xfs_meta_bad, which we will use to integrate some
corruption reporting when the corruption test expression is true. This
will be used in the next patch to remove the ugly XFS_WANT_CORRUPT*
macros.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
fs/xfs/xfs_linux.h | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
index 2271db4e8d66..d0fb1e612c42 100644
--- a/fs/xfs/xfs_linux.h
+++ b/fs/xfs/xfs_linux.h
@@ -229,6 +229,10 @@ int xfs_rw_bdev(struct block_device *bdev, sector_t sector, unsigned int count,
#define ASSERT(expr) \
(likely(expr) ? (void)0 : assfail(NULL, #expr, __FILE__, __LINE__))
+#define xfs_meta_bad(mp, expr) \
+ (unlikely(expr) ? assfail((mp), #expr, __FILE__, __LINE__), \
+ true : false)
+
#else /* !DEBUG */
#ifdef XFS_WARN
@@ -236,13 +240,23 @@ int xfs_rw_bdev(struct block_device *bdev, sector_t sector, unsigned int count,
#define ASSERT(expr) \
(likely(expr) ? (void)0 : asswarn(NULL, #expr, __FILE__, __LINE__))
+#define xfs_meta_bad(mp, expr) \
+ (unlikely(expr) ? asswarn((mp), #expr, __FILE__, __LINE__), \
+ true : false)
+
#else /* !DEBUG && !XFS_WARN */
-#define ASSERT(expr) ((void)0)
+#define ASSERT(expr) ((void)0)
+
+#define xfs_meta_bad(mp, expr) \
+ (unlikely(expr) ? XFS_ERROR_REPORT(#expr, XFS_ERRLEVEL_LOW, (mp)), \
+ true : false)
#endif /* XFS_WARN */
#endif /* DEBUG */
+#define if_xfs_meta_bad(mp, expr) if (xfs_meta_bad((mp), (expr)))
+
#define STATIC static noinline
#ifdef CONFIG_XFS_RT
next prev parent reply other threads:[~2019-11-11 1:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-11 1:17 [PATCH v4 0/3] xfs: refactor corruption returns Darrick J. Wong
2019-11-11 1:17 ` Darrick J. Wong [this message]
2019-11-11 13:51 ` [PATCH 1/3] xfs: add a if_xfs_meta_bad macro for testing and logging bad metadata Brian Foster
2019-11-13 0:01 ` Darrick J. Wong
2019-11-11 1:18 ` [PATCH 2/3] xfs: kill the XFS_WANT_CORRUPT_* macros Darrick J. Wong
2019-11-11 8:51 ` Christoph Hellwig
2019-11-12 23:08 ` Darrick J. Wong
2019-11-11 1:18 ` [PATCH 3/3] xfs: convert open coded corruption check to use XFS_IS_CORRUPT Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=157343507829.1945685.13191379852906635565.stgit@magnolia \
--to=darrick.wong@oracle.com \
--cc=david@fromorbit.org \
--cc=hch@infradead.org \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.