mkfs: validate extent size hint parameters

[thirdparty/xfsprogs-dev.git] / db / bmroot.c

diff --git a/db/bmroot.c b/db/bmroot.c
index a08bd717ddc7299b837edecd6c7c96d64ff792be..0db526c643aa120eeb13017bcf87ccc60063a621 100644 (file)
--- a/db/bmroot.c
+++ b/db/bmroot.c
@@ -1,22 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2000-2001,2005 Silicon Graphics, Inc.
  * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write the Free Software Foundation,
- * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "libxfs.h"
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"
@@ -80,8 +68,8 @@ bmroota_key_count(
        ASSERT(obj == iocur_top->data);
        block = (xfs_bmdr_block_t *)((char *)obj + byteize(startoff));
        ASSERT(XFS_DFORK_Q(dip) && (char *)block == XFS_DFORK_APTR(dip));
-       ASSERT(INT_GET(block->bb_level, ARCH_CONVERT) > 0);
-       return INT_GET(block->bb_numrecs, ARCH_CONVERT);
+       ASSERT(be16_to_cpu(block->bb_level) > 0);
+       return be16_to_cpu(block->bb_numrecs);
 }
 
 static int
@@ -91,18 +79,17 @@ bmroota_key_offset(
        int                     idx)
 {
        xfs_bmdr_block_t        *block;
-       /* REFERENCED */
-       xfs_dinode_t            *dip;
+#ifdef DEBUG
+       xfs_dinode_t            *dip = obj;
+#endif
        xfs_bmdr_key_t          *kp;
 
        ASSERT(bitoffs(startoff) == 0);
        ASSERT(obj == iocur_top->data);
-       dip = obj;
        block = (xfs_bmdr_block_t *)((char *)obj + byteize(startoff));
        ASSERT(XFS_DFORK_Q(dip) && (char *)block == XFS_DFORK_APTR(dip));
-       ASSERT(INT_GET(block->bb_level, ARCH_CONVERT) > 0);
-       kp = XFS_BTREE_KEY_ADDR(iocur_top->len, xfs_bmdr, block, idx,
-               XFS_BTREE_BLOCK_MAXRECS(XFS_DFORK_ASIZE(dip, mp), xfs_bmdr, 0));
+       ASSERT(be16_to_cpu(block->bb_level) > 0);
+       kp = XFS_BMDR_KEY_ADDR(block, idx);
        return bitize((int)((char *)kp - (char *)block));
 }
 
@@ -120,8 +107,8 @@ bmroota_ptr_count(
        ASSERT(obj == iocur_top->data);
        block = (xfs_bmdr_block_t *)((char *)obj + byteize(startoff));
        ASSERT(XFS_DFORK_Q(dip) && (char *)block == XFS_DFORK_APTR(dip));
-       ASSERT(INT_GET(block->bb_level, ARCH_CONVERT) > 0);
-       return INT_GET(block->bb_numrecs, ARCH_CONVERT);
+       ASSERT(be16_to_cpu(block->bb_level) > 0);
+       return be16_to_cpu(block->bb_numrecs);
 }
 
 static int
@@ -139,9 +126,9 @@ bmroota_ptr_offset(
        dip = obj;
        block = (xfs_bmdr_block_t *)((char *)obj + byteize(startoff));
        ASSERT(XFS_DFORK_Q(dip) && (char *)block == XFS_DFORK_APTR(dip));
-       ASSERT(INT_GET(block->bb_level, ARCH_CONVERT) > 0);
-       pp = XFS_BTREE_PTR_ADDR(iocur_top->len, xfs_bmdr, block, idx,
-               XFS_BTREE_BLOCK_MAXRECS(XFS_DFORK_ASIZE(dip, mp), xfs_bmdr, 0));
+       ASSERT(be16_to_cpu(block->bb_level) > 0);
+       pp = XFS_BMDR_PTR_ADDR(block, idx,
+               libxfs_bmdr_maxrecs(XFS_DFORK_ASIZE(dip, mp), 0));
        return bitize((int)((char *)pp - (char *)block));
 }
 
@@ -181,8 +168,8 @@ bmrootd_key_count(
        ASSERT(obj == iocur_top->data);
        block = (xfs_bmdr_block_t *)((char *)obj + byteize(startoff));
        ASSERT((char *)block == XFS_DFORK_DPTR(dip));
-       ASSERT(INT_GET(block->bb_level, ARCH_CONVERT) > 0);
-       return INT_GET(block->bb_numrecs, ARCH_CONVERT);
+       ASSERT(be16_to_cpu(block->bb_level) > 0);
+       return be16_to_cpu(block->bb_numrecs);
 }
 
 static int
@@ -193,15 +180,12 @@ bmrootd_key_offset(
 {
        xfs_bmdr_block_t        *block;
        xfs_bmdr_key_t          *kp;
-       xfs_dinode_t            *dip;
 
        ASSERT(bitoffs(startoff) == 0);
        ASSERT(obj == iocur_top->data);
-       dip = obj;
        block = (xfs_bmdr_block_t *)((char *)obj + byteize(startoff));
-       ASSERT(INT_GET(block->bb_level, ARCH_CONVERT) > 0);
-       kp = XFS_BTREE_KEY_ADDR(iocur_top->len, xfs_bmdr, block, idx,
-               XFS_BTREE_BLOCK_MAXRECS(XFS_DFORK_DSIZE(dip, mp), xfs_bmdr, 0));
+       ASSERT(be16_to_cpu(block->bb_level) > 0);
+       kp = XFS_BMDR_KEY_ADDR(block, idx);
        return bitize((int)((char *)kp - (char *)block));
 }
 
@@ -219,8 +203,8 @@ bmrootd_ptr_count(
        ASSERT(obj == iocur_top->data);
        block = (xfs_bmdr_block_t *)((char *)obj + byteize(startoff));
        ASSERT((char *)block == XFS_DFORK_DPTR(dip));
-       ASSERT(INT_GET(block->bb_level, ARCH_CONVERT) > 0);
-       return INT_GET(block->bb_numrecs, ARCH_CONVERT);
+       ASSERT(be16_to_cpu(block->bb_level) > 0);
+       return be16_to_cpu(block->bb_numrecs);
 }
 
 static int
@@ -237,9 +221,9 @@ bmrootd_ptr_offset(
        ASSERT(obj == iocur_top->data);
        dip = obj;
        block = (xfs_bmdr_block_t *)((char *)obj + byteize(startoff));
-       ASSERT(INT_GET(block->bb_level, ARCH_CONVERT) > 0);
-       pp = XFS_BTREE_PTR_ADDR(iocur_top->len, xfs_bmdr, block, idx,
-               XFS_BTREE_BLOCK_MAXRECS(XFS_DFORK_DSIZE(dip, mp), xfs_bmdr, 0));
+       ASSERT(be16_to_cpu(block->bb_level) > 0);
+       pp = XFS_BMDR_PTR_ADDR(block, idx,
+               libxfs_bmdr_maxrecs(XFS_DFORK_DSIZE(dip, mp), 0));
        return bitize((int)((char *)pp - (char *)block));
 }