xfs: remove unused parameter in macro XFS_DQUOT_LOGRES
BugLink: https://bugs.launchpad.net/bugs/2102266 commit af5d92f2fad818663da2ce073b6fe15b9d56ffdc upstream. 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: Julian Sun <sunjunchao2870@gmail.com> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Chandan Babu R <chandanbabu@kernel.org> Signed-off-by: Catherine Hoang <catherine.hoang@oracle.com> Acked-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Koichiro Den <koichiro.den@canonical.com> Signed-off-by: Mehmet Basaran <mehmet.basaran@canonical.com>
This commit is contained in:
committed by
Mehmet Basaran
parent
3b6cb0955a
commit
42852a5903
@@ -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)
|
||||
|
||||
@@ -336,11 +336,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
|
||||
@@ -408,11 +408,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
|
||||
@@ -438,7 +438,7 @@ STATIC uint
|
||||
xfs_calc_rename_reservation(
|
||||
struct xfs_mount *mp)
|
||||
{
|
||||
return XFS_DQUOT_LOGRES(mp) +
|
||||
return XFS_DQUOT_LOGRES +
|
||||
max((xfs_calc_inode_res(mp, 5) +
|
||||
xfs_calc_buf_res(2 * XFS_DIROP_LOG_COUNT(mp),
|
||||
XFS_FSB_TO_B(mp, 1))),
|
||||
@@ -477,7 +477,7 @@ STATIC uint
|
||||
xfs_calc_link_reservation(
|
||||
struct xfs_mount *mp)
|
||||
{
|
||||
return XFS_DQUOT_LOGRES(mp) +
|
||||
return XFS_DQUOT_LOGRES +
|
||||
xfs_calc_iunlink_remove_reservation(mp) +
|
||||
max((xfs_calc_inode_res(mp, 2) +
|
||||
xfs_calc_buf_res(XFS_DIROP_LOG_COUNT(mp),
|
||||
@@ -515,7 +515,7 @@ STATIC uint
|
||||
xfs_calc_remove_reservation(
|
||||
struct xfs_mount *mp)
|
||||
{
|
||||
return XFS_DQUOT_LOGRES(mp) +
|
||||
return XFS_DQUOT_LOGRES +
|
||||
xfs_calc_iunlink_add_reservation(mp) +
|
||||
max((xfs_calc_inode_res(mp, 2) +
|
||||
xfs_calc_buf_res(XFS_DIROP_LOG_COUNT(mp),
|
||||
@@ -574,7 +574,7 @@ xfs_calc_icreate_resv_alloc(
|
||||
STATIC uint
|
||||
xfs_calc_icreate_reservation(xfs_mount_t *mp)
|
||||
{
|
||||
return XFS_DQUOT_LOGRES(mp) +
|
||||
return XFS_DQUOT_LOGRES +
|
||||
max(xfs_calc_icreate_resv_alloc(mp),
|
||||
xfs_calc_create_resv_modify(mp));
|
||||
}
|
||||
@@ -583,7 +583,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);
|
||||
@@ -632,7 +632,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) +
|
||||
@@ -649,7 +649,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);
|
||||
|
||||
@@ -758,7 +758,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) +
|
||||
@@ -806,7 +806,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));
|
||||
@@ -846,7 +846,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)) +
|
||||
|
||||
Reference in New Issue
Block a user