1 files changed, 5 insertions, 3 deletions

diff --git a/fs/xfs/libxfs/xfs_btree.h b/fs/xfs/libxfs/xfs_btree.h
index b69b947c4c1b..4bb62580a7fd 100644
--- a/fs/xfs/libxfs/xfs_btree.h
+++ b/fs/xfs/libxfs/xfs_btree.h
@@ -76,6 +76,8 @@ union xfs_btree_rec {
 #define XFS_BTNUM_RMAP  ((xfs_btnum_t)XFS_BTNUM_RMAPi)
 #define XFS_BTNUM_REFC  ((xfs_btnum_t)XFS_BTNUM_REFCi)
 
+__uint32_t xfs_btree_magic(int crc, xfs_btnum_t btnum);
+
 /*
  * For logging record fields.
  */
@@ -378,7 +380,7 @@ void
 xfs_btree_init_block(
         struct xfs_mount *mp,
         struct xfs_buf  *bp,
-        __u32           magic,
+        xfs_btnum_t     btnum,
         __u16           level,
         __u16           numrecs,
         __u64           owner,
@@ -389,7 +391,7 @@ xfs_btree_init_block_int(
         struct xfs_mount        *mp,
         struct xfs_btree_block  *buf,
         xfs_daddr_t             blkno,
-        __u32                   magic,
+        xfs_btnum_t             btnum,
         __u16                   level,
         __u16                   numrecs,
         __u64                   owner,
@@ -456,7 +458,7 @@ static inline int xfs_btree_get_level(struct xfs_btree_block *block)
 #define XFS_FILBLKS_MAX(a,b)    max_t(xfs_filblks_t, (a), (b))
 
 #define XFS_FSB_SANITY_CHECK(mp,fsb)    \
-        (XFS_FSB_TO_AGNO(mp, fsb) < mp->m_sb.sb_agcount && \
+        (fsb && XFS_FSB_TO_AGNO(mp, fsb) < mp->m_sb.sb_agcount && \
                 XFS_FSB_TO_AGBNO(mp, fsb) < mp->m_sb.sb_agblocks)
 
 /*