Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdd3a2ae authored by Dave Chinner's avatar Dave Chinner
Browse files

Merge branch 'xfs-unused-args-cleanup' into for-next

parents ee4eec47 5e06d148

fs/xfs/xfs_alloc_btree.c

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ xfs_allocbt_alloc_block( 
	struct xfs_btree_cur	*cur,

	union xfs_btree_ptr	*start,

	union xfs_btree_ptr	*new,

	int			length,

	int			*stat)

{

	int			error;

fs/xfs/xfs_attr_remote.c

+1 −2
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ xfs_attr3_rmt_blocks( 
 */

static bool

xfs_attr3_rmt_hdr_ok(

	struct xfs_mount	*mp,

	void			*ptr,

	xfs_ino_t		ino,

	uint32_t		offset,
@@ -251,7 +250,7 @@ xfs_attr_rmtval_copyout( 
		byte_cnt = min(*valuelen, byte_cnt);



		if (xfs_sb_version_hascrc(&mp->m_sb)) {

			if (!xfs_attr3_rmt_hdr_ok(mp, src, ino, *offset,

			if (!xfs_attr3_rmt_hdr_ok(src, ino, *offset,

						  byte_cnt, bno)) {

				xfs_alert(mp,

"remote attribute header mismatch bno/off/len/owner (0x%llx/0x%x/Ox%x/0x%llx)",

fs/xfs/xfs_bmap.c

+2 −4
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ xfs_bmap_compute_maxlevels( 
		maxleafents = MAXAEXTNUM;

		sz = XFS_BMDR_SPACE_CALC(MINABTPTRS);

	}

	maxrootrecs = xfs_bmdr_maxrecs(mp, sz, 0);

	maxrootrecs = xfs_bmdr_maxrecs(sz, 0);

	minleafrecs = mp->m_bmap_dmnr[0];

	minnoderecs = mp->m_bmap_dmnr[1];

	maxblocks = (maxleafents + minleafrecs - 1) / minleafrecs;
@@ -233,7 +233,6 @@ xfs_default_attroffset( 
 */

STATIC void

xfs_bmap_forkoff_reset(

	xfs_mount_t	*mp,

	xfs_inode_t	*ip,

	int		whichfork)

{
@@ -905,7 +904,7 @@ xfs_bmap_local_to_extents_empty( 
	ASSERT(ifp->if_bytes == 0);

	ASSERT(XFS_IFORK_NEXTENTS(ip, whichfork) == 0);



	xfs_bmap_forkoff_reset(ip->i_mount, ip, whichfork);

	xfs_bmap_forkoff_reset(ip, whichfork);

	ifp->if_flags &= ~XFS_IFINLINE;

	ifp->if_flags |= XFS_IFEXTENTS;

	XFS_IFORK_FMT_SET(ip, whichfork, XFS_DINODE_FMT_EXTENTS);
@@ -1675,7 +1674,6 @@ xfs_bmap_isaeof( 
 */

int

xfs_bmap_last_offset(

	struct xfs_trans	*tp,

	struct xfs_inode	*ip,

	xfs_fileoff_t		*last_block,

	int			whichfork)

fs/xfs/xfs_bmap.h

+2 −2
Original line number Diff line number Diff line
@@ -156,8 +156,8 @@ int xfs_bmap_first_unused(struct xfs_trans *tp, struct xfs_inode *ip, 
		xfs_extlen_t len, xfs_fileoff_t *unused, int whichfork);

int	xfs_bmap_last_before(struct xfs_trans *tp, struct xfs_inode *ip,

		xfs_fileoff_t *last_block, int whichfork);

int	xfs_bmap_last_offset(struct xfs_trans *tp, struct xfs_inode *ip,

		xfs_fileoff_t *unused, int whichfork);

int	xfs_bmap_last_offset(struct xfs_inode *ip, xfs_fileoff_t *unused,

		int whichfork);

int	xfs_bmap_one_block(struct xfs_inode *ip, int whichfork);

int	xfs_bmap_read_extents(struct xfs_trans *tp, struct xfs_inode *ip,

		int whichfork);

fs/xfs/xfs_bmap_btree.c

+3 −6
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ xfs_bmdr_to_bmbt( 
	rblock->bb_level = dblock->bb_level;

	ASSERT(be16_to_cpu(rblock->bb_level) > 0);

	rblock->bb_numrecs = dblock->bb_numrecs;

	dmxr = xfs_bmdr_maxrecs(mp, dblocklen, 0);

	dmxr = xfs_bmdr_maxrecs(dblocklen, 0);

	fkp = XFS_BMDR_KEY_ADDR(dblock, 1);

	tkp = XFS_BMBT_KEY_ADDR(mp, rblock, 1);

	fpp = XFS_BMDR_PTR_ADDR(dblock, 1, dmxr);
@@ -443,7 +443,7 @@ xfs_bmbt_to_bmdr( 
	ASSERT(rblock->bb_level != 0);

	dblock->bb_level = rblock->bb_level;

	dblock->bb_numrecs = rblock->bb_numrecs;

	dmxr = xfs_bmdr_maxrecs(mp, dblocklen, 0);

	dmxr = xfs_bmdr_maxrecs(dblocklen, 0);

	fkp = XFS_BMBT_KEY_ADDR(mp, rblock, 1);

	tkp = XFS_BMDR_KEY_ADDR(dblock, 1);

	fpp = XFS_BMAP_BROOT_PTR_ADDR(mp, rblock, 1, rblocklen);
@@ -519,7 +519,6 @@ xfs_bmbt_alloc_block( 
	struct xfs_btree_cur	*cur,

	union xfs_btree_ptr	*start,

	union xfs_btree_ptr	*new,

	int			length,

	int			*stat)

{

	xfs_alloc_arg_t		args;		/* block allocation args */
@@ -672,8 +671,7 @@ xfs_bmbt_get_dmaxrecs( 
{

	if (level != cur->bc_nlevels - 1)

		return cur->bc_mp->m_bmap_dmxr[level != 0];

	return xfs_bmdr_maxrecs(cur->bc_mp, cur->bc_private.b.forksize,

				level == 0);

	return xfs_bmdr_maxrecs(cur->bc_private.b.forksize, level == 0);

}



STATIC void
@@ -914,7 +912,6 @@ xfs_bmbt_maxrecs( 
 */

int

xfs_bmdr_maxrecs(

	struct xfs_mount	*mp,

	int			blocklen,

	int			leaf)

{