From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org, hch@infradead.org
Subject: [PATCH 1/4] xfs: add a XFS_IS_CORRUPT macro
Date: Wed, 06 Nov 2019 19:01:54 -0800 [thread overview]
Message-ID: <157309571493.45542.17191993682067205278.stgit@magnolia> (raw)
In-Reply-To: <157309570855.45542.14663613458519550414.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
Add a new macro, XFS_IS_CORRUPT, 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 | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
index 2271db4e8d66..64bbbcc77851 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_IS_CORRUPT(mp, expr) \
+ (unlikely(expr) ? assfail((mp), #expr, __FILE__, __LINE__), \
+ true : false)
+
#else /* !DEBUG */
#ifdef XFS_WARN
@@ -236,9 +240,16 @@ 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_IS_CORRUPT(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_IS_CORRUPT(mp, expr) \
+ (unlikely(expr) ? XFS_ERROR_REPORT(#expr, XFS_ERRLEVEL_LOW, (mp)), \
+ true : false)
#endif /* XFS_WARN */
#endif /* DEBUG */
next prev parent reply other threads:[~2019-11-07 3:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-07 3:01 [PATCH 0/4] xfs: refactor corruption checking and reporting Darrick J. Wong
2019-11-07 3:01 ` Darrick J. Wong [this message]
2019-11-07 18:16 ` [PATCH 1/4] xfs: add a XFS_IS_CORRUPT macro Christoph Hellwig
2019-11-07 3:02 ` [PATCH 2/4] xfs: kill the XFS_WANT_CORRUPT_* macros Darrick J. Wong
2019-11-07 18:16 ` Christoph Hellwig
2019-11-07 3:02 ` [PATCH 3/4] xfs: convert open coded corruption check to use XFS_IS_CORRUPT Darrick J. Wong
2019-11-07 18:25 ` Christoph Hellwig
2019-11-07 20:57 ` Darrick J. Wong
2019-11-08 0:01 ` Darrick J. Wong
2019-11-07 3:02 ` [PATCH 4/4] xfs: convert EIO to EFSCORRUPTED when log contents are invalid Darrick J. Wong
2019-11-07 8:46 ` Christoph Hellwig
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=157309571493.45542.17191993682067205278.stgit@magnolia \
--to=darrick.wong@oracle.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).