[xen stable-4.16] libfsimage/xfs: Remove dead code

[patchbot@xxxxxxx]

commit d51a2a1843b612b03f764703159a0946fe026750
Author:     Alejandro Vallejo <alejandro.vallejo@xxxxxxxxx>
AuthorDate: Thu Sep 14 13:22:50 2023 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Wed Sep 27 16:29:50 2023 +0100

    libfsimage/xfs: Remove dead code
    
    xfs_info.agnolog (and related code) and XFS_INO_AGBNO_BITS are dead code
    that serve no purpose.
    
    This is part of XSA-443 / CVE-2023-34325
    
    Signed-off-by: Alejandro Vallejo <alejandro.vallejo@xxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
    (cherry picked from commit 37fc1e6c1c5c63aafd9cfd76a37728d5baea7d71)
---
 tools/libfsimage/xfs/fsys_xfs.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/tools/libfsimage/xfs/fsys_xfs.c b/tools/libfsimage/xfs/fsys_xfs.c
index d735a88e55..2800699f59 100644
--- a/tools/libfsimage/xfs/fsys_xfs.c
+++ b/tools/libfsimage/xfs/fsys_xfs.c
@@ -37,7 +37,6 @@ struct xfs_info {
        int blklog;
        int inopblog;
        int agblklog;
-       int agnolog;
        unsigned int nextents;
        xfs_daddr_t next;
        xfs_daddr_t daddr;
@@ -65,9 +64,7 @@ static struct xfs_info xfs;
 
 #define        XFS_INO_MASK(k)         ((xfs_uint32_t)((1ULL << (k)) - 1))
 #define        XFS_INO_OFFSET_BITS     xfs.inopblog
-#define        XFS_INO_AGBNO_BITS      xfs.agblklog
 #define        XFS_INO_AGINO_BITS      (xfs.agblklog + xfs.inopblog)
-#define        XFS_INO_AGNO_BITS       xfs.agnolog
 
 static inline xfs_agblock_t
 agino2agbno (xfs_agino_t agino)
@@ -149,20 +146,6 @@ xt_len (xfs_bmbt_rec_32_t *r)
        return le32(r->l3) & mask32lo(21);
 }
 
-static inline int
-xfs_highbit32(xfs_uint32_t v)
-{
-       int i;
-
-       if (--v) {
-               for (i = 0; i < 31; i++, v >>= 1) {
-                       if (v == 0)
-                               return i;
-               }
-       }
-       return 0;
-}
-
 static int
 isinxt (xfs_fileoff_t key, xfs_fileoff_t offset, xfs_filblks_t len)
 {
@@ -472,7 +455,6 @@ xfs_mount (fsi_file_t *ffi, const char *options)
 
        xfs.inopblog = super.sb_inopblog;
        xfs.agblklog = super.sb_agblklog;
-       xfs.agnolog = xfs_highbit32 (le32(super.sb_agcount));
 
        xfs.btnode_ptr0_off =
                ((xfs.bsize - sizeof(xfs_btree_block_t)) /
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.16