iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfs: remove the unnecessary daddr paramter to _init_block

Browse Source 
Now that all of the callers pass XFS_BUF_DADDR_NULL as the daddr
parameter, we can elide that too.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Darrick J. Wong 2024-02-22 12:35:19 -08:00
parent 7771f70300
commit 11388f6581
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/xfs/libxfs/xfs_bmap_btree.c
View File

@ -38,8 +38,8 @@ xfs_bmbt_init_block(
xfs_btree_init_buf(ip->i_mount, bp, &xfs_bmbt_ops, level,
numrecs, ip->i_ino);
else
xfs_btree_init_block(ip->i_mount, buf, &xfs_bmbt_ops,
XFS_BUF_DADDR_NULL, level, numrecs, ip->i_ino);
xfs_btree_init_block(ip->i_mount, buf, &xfs_bmbt_ops, level,
numrecs, ip->i_ino);
}
/*

19
fs/xfs/libxfs/xfs_btree.c
View File

@ -1153,8 +1153,8 @@ xfs_btree_set_sibling(
}
}
void
xfs_btree_init_block(
static void
__xfs_btree_init_block(
struct xfs_mount *mp,
struct xfs_btree_block *buf,
const struct xfs_btree_ops *ops,
@ -1195,6 +1195,19 @@ xfs_btree_init_block(
}
}
void
xfs_btree_init_block(
struct xfs_mount *mp,
struct xfs_btree_block *block,
const struct xfs_btree_ops *ops,
__u16 level,
__u16 numrecs,
__u64 owner)
{
__xfs_btree_init_block(mp, block, ops, XFS_BUF_DADDR_NULL, level,
numrecs, owner);
}
void
xfs_btree_init_buf(
struct xfs_mount *mp,
@ -1204,7 +1217,7 @@ xfs_btree_init_buf(
__u16 numrecs,
__u64 owner)
{
xfs_btree_init_block(mp, XFS_BUF_TO_BLOCK(bp), ops,
__xfs_btree_init_block(mp, XFS_BUF_TO_BLOCK(bp), ops,
xfs_buf_daddr(bp), level, numrecs, owner);
}

2
fs/xfs/libxfs/xfs_btree.h
View File

@ -440,7 +440,7 @@ void xfs_btree_init_buf(struct xfs_mount *mp, struct xfs_buf *bp,
__u64 owner);
void xfs_btree_init_block(struct xfs_mount *mp,
struct xfs_btree_block *buf, const struct xfs_btree_ops *ops,
xfs_daddr_t blkno, __u16 level, __u16 numrecs, __u64 owner);
__u16 level, __u16 numrecs, __u64 owner);
/*
* Common btree core entry points.

5
fs/xfs/libxfs/xfs_btree_staging.c
View File

@ -410,9 +410,8 @@ xfs_btree_bload_prep_block(
ifp->if_broot_bytes = (int)new_size;
/* Initialize it and send it out. */
xfs_btree_init_block(cur->bc_mp, ifp->if_broot,
cur->bc_ops, XFS_BUF_DADDR_NULL, level,
nr_this_block, cur->bc_ino.ip->i_ino);
xfs_btree_init_block(cur->bc_mp, ifp->if_broot, cur->bc_ops,
level, nr_this_block, cur->bc_ino.ip->i_ino);
*bpp = NULL;
*blockp = ifp->if_broot;