Commit af5d92f2 authored by Julian Sun's avatar Julian Sun Committed by Chandan Babu R
Browse files

xfs: remove unused parameter in macro XFS_DQUOT_LOGRES 



In the macro definition of XFS_DQUOT_LOGRES, a parameter is accepted,
but it is not used. Hence, it should be removed.

This patch has only passed compilation test, but it should be fine.

Signed-off-by: default avatarJulian Sun <sunjunchao2870@gmail.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandanbabu@kernel.org>
parent 19ebc8f8

fs/xfs/libxfs/xfs_quota_defs.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ typedef uint8_t xfs_dqtype_t; 
 * And, of course, we also need to take into account the dquot log format item

 * used to describe each dquot.

 */

#define XFS_DQUOT_LOGRES(mp)	\

#define XFS_DQUOT_LOGRES	\

	((sizeof(struct xfs_dq_logformat) + sizeof(struct xfs_disk_dquot)) * 6)



#define XFS_IS_QUOTA_ON(mp)		((mp)->m_qflags & XFS_ALL_QUOTA_ACCT)

fs/xfs/libxfs/xfs_trans_resv.c

+14 −14
Original line number Diff line number Diff line
@@ -338,11 +338,11 @@ xfs_calc_write_reservation( 
					blksz);

		t1 += adj;

		t3 += adj;

		return XFS_DQUOT_LOGRES(mp) + max3(t1, t2, t3);

		return XFS_DQUOT_LOGRES + max3(t1, t2, t3);

	}



	t4 = xfs_calc_refcountbt_reservation(mp, 1);

	return XFS_DQUOT_LOGRES(mp) + max(t4, max3(t1, t2, t3));

	return XFS_DQUOT_LOGRES + max(t4, max3(t1, t2, t3));

}



unsigned int
@@ -410,11 +410,11 @@ xfs_calc_itruncate_reservation( 
					xfs_refcountbt_block_count(mp, 4),

					blksz);



		return XFS_DQUOT_LOGRES(mp) + max3(t1, t2, t3);

		return XFS_DQUOT_LOGRES + max3(t1, t2, t3);

	}



	t4 = xfs_calc_refcountbt_reservation(mp, 2);

	return XFS_DQUOT_LOGRES(mp) + max(t4, max3(t1, t2, t3));

	return XFS_DQUOT_LOGRES + max(t4, max3(t1, t2, t3));

}



unsigned int
@@ -466,7 +466,7 @@ STATIC uint 
xfs_calc_rename_reservation(

	struct xfs_mount	*mp)

{

	unsigned int		overhead = XFS_DQUOT_LOGRES(mp);

	unsigned int		overhead = XFS_DQUOT_LOGRES;

	struct xfs_trans_resv	*resp = M_RES(mp);

	unsigned int		t1, t2, t3 = 0;
@@ -577,7 +577,7 @@ STATIC uint 
xfs_calc_link_reservation(

	struct xfs_mount	*mp)

{

	unsigned int		overhead = XFS_DQUOT_LOGRES(mp);

	unsigned int		overhead = XFS_DQUOT_LOGRES;

	struct xfs_trans_resv	*resp = M_RES(mp);

	unsigned int		t1, t2, t3 = 0;
@@ -641,7 +641,7 @@ STATIC uint 
xfs_calc_remove_reservation(

	struct xfs_mount	*mp)

{

	unsigned int            overhead = XFS_DQUOT_LOGRES(mp);

	unsigned int            overhead = XFS_DQUOT_LOGRES;

	struct xfs_trans_resv   *resp = M_RES(mp);

	unsigned int            t1, t2, t3 = 0;
@@ -729,7 +729,7 @@ xfs_calc_icreate_reservation( 
	struct xfs_mount	*mp)

{

	struct xfs_trans_resv	*resp = M_RES(mp);

	unsigned int		overhead = XFS_DQUOT_LOGRES(mp);

	unsigned int		overhead = XFS_DQUOT_LOGRES;

	unsigned int		t1, t2, t3 = 0;



	t1 = xfs_calc_icreate_resv_alloc(mp);
@@ -747,7 +747,7 @@ STATIC uint 
xfs_calc_create_tmpfile_reservation(

	struct xfs_mount        *mp)

{

	uint	res = XFS_DQUOT_LOGRES(mp);

	uint	res = XFS_DQUOT_LOGRES;



	res += xfs_calc_icreate_resv_alloc(mp);

	return res + xfs_calc_iunlink_add_reservation(mp);
@@ -829,7 +829,7 @@ STATIC uint 
xfs_calc_ifree_reservation(

	struct xfs_mount	*mp)

{

	return XFS_DQUOT_LOGRES(mp) +

	return XFS_DQUOT_LOGRES +

		xfs_calc_inode_res(mp, 1) +

		xfs_calc_buf_res(3, mp->m_sb.sb_sectsize) +

		xfs_calc_iunlink_remove_reservation(mp) +
@@ -846,7 +846,7 @@ STATIC uint 
xfs_calc_ichange_reservation(

	struct xfs_mount	*mp)

{

	return XFS_DQUOT_LOGRES(mp) +

	return XFS_DQUOT_LOGRES +

		xfs_calc_inode_res(mp, 1) +

		xfs_calc_buf_res(1, mp->m_sb.sb_sectsize);
@@ -955,7 +955,7 @@ STATIC uint 
xfs_calc_addafork_reservation(

	struct xfs_mount	*mp)

{

	return XFS_DQUOT_LOGRES(mp) +

	return XFS_DQUOT_LOGRES +

		xfs_calc_inode_res(mp, 1) +

		xfs_calc_buf_res(2, mp->m_sb.sb_sectsize) +

		xfs_calc_buf_res(1, mp->m_dir_geo->blksize) +
@@ -1003,7 +1003,7 @@ STATIC uint 
xfs_calc_attrsetm_reservation(

	struct xfs_mount	*mp)

{

	return XFS_DQUOT_LOGRES(mp) +

	return XFS_DQUOT_LOGRES +

		xfs_calc_inode_res(mp, 1) +

		xfs_calc_buf_res(1, mp->m_sb.sb_sectsize) +

		xfs_calc_buf_res(XFS_DA_NODE_MAXDEPTH, XFS_FSB_TO_B(mp, 1));
@@ -1043,7 +1043,7 @@ STATIC uint 
xfs_calc_attrrm_reservation(

	struct xfs_mount	*mp)

{

	return XFS_DQUOT_LOGRES(mp) +

	return XFS_DQUOT_LOGRES +

		max((xfs_calc_inode_res(mp, 1) +

		     xfs_calc_buf_res(XFS_DA_NODE_MAXDEPTH,

				      XFS_FSB_TO_B(mp, 1)) +