summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_buf.c
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2019-02-16 22:47:28 +0300
committerDarrick J. Wong <darrick.wong@oracle.com>2019-02-18 20:38:41 +0300
commit15baadf72cedc2a09ea792c1fc59451502b55da2 (patch)
tree065992ac6a62f3dd3bb46b58734f999db5748b51 /fs/xfs/xfs_buf.c
parent7588cbeec6df925ef6142a7e48762896c06007a8 (diff)
downloadlinux-15baadf72cedc2a09ea792c1fc59451502b55da2.tar.xz
xfs: fix xfs_buf magic number endian checks
Create a separate magic16 check function so that we don't run afoul of static checkers. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Brian Foster <bfoster@redhat.com>
Diffstat (limited to 'fs/xfs/xfs_buf.c')
-rw-r--r--fs/xfs/xfs_buf.c20
1 files changed, 19 insertions, 1 deletions
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 52a382b8cbce..548344e25128 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -2213,7 +2213,7 @@ void xfs_buf_set_ref(struct xfs_buf *bp, int lru_ref)
bool
xfs_verify_magic(
struct xfs_buf *bp,
- uint32_t dmagic)
+ __be32 dmagic)
{
struct xfs_mount *mp = bp->b_target->bt_mount;
int idx;
@@ -2223,3 +2223,21 @@ xfs_verify_magic(
return false;
return dmagic == bp->b_ops->magic[idx];
}
+/*
+ * Verify an on-disk magic value against the magic value specified in the
+ * verifier structure. The verifier magic is in disk byte order so the caller is
+ * expected to pass the value directly from disk.
+ */
+bool
+xfs_verify_magic16(
+ struct xfs_buf *bp,
+ __be16 dmagic)
+{
+ struct xfs_mount *mp = bp->b_target->bt_mount;
+ int idx;
+
+ idx = xfs_sb_version_hascrc(&mp->m_sb);
+ if (unlikely(WARN_ON(!bp->b_ops || !bp->b_ops->magic16[idx])))
+ return false;
+ return dmagic == bp->b_ops->magic16[idx];
+}