Skip to content

L
linux
Commit 5b292ae3 authored by Jeff Liu's avatar Jeff Liu Committed by Ben Myers
Browse files
Options

xfs: make use of xfs_calc_buf_res() in xfs_trans.c 

Refining the existing reservations with xfs_calc_buf_res() in xfs_trans.c
Signed-off-by: default avatarJie Liu <jeff.liu@oracle.com>
CC: Dave Chinner <david@fromorbit.com>
Reviewed-by: default avatarMark Tinguely <tinguely@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 4f3b5783
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 128 deletions
fs/xfs/xfs_trans.c
View file @ 5b292ae3
...@@ -116,18 +116,15 @@ xfs_calc_write_reservation( ...@@ -116,18 +116,15 @@ xfs_calc_write_reservation(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
return XFS_DQUOT_LOGRES(mp) + return XFS_DQUOT_LOGRES(mp) +
MAX((mp->m_sb.sb_inodesize + MAX((xfs_calc_buf_res(1, mp->m_sb.sb_inodesize) +
XFS_FSB_TO_B(mp, XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK)) + xfs_calc_buf_res(XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK),
2 * mp->m_sb.sb_sectsize + XFS_FSB_TO_B(mp, 1)) +
mp->m_sb.sb_sectsize + xfs_calc_buf_res(3, mp->m_sb.sb_sectsize) +
XFS_ALLOCFREE_LOG_RES(mp, 2) + xfs_calc_buf_res(XFS_ALLOCFREE_LOG_COUNT(mp, 2),
128 * (4 + XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK) + XFS_FSB_TO_B(mp, 1))),
XFS_ALLOCFREE_LOG_COUNT(mp, 2))), (xfs_calc_buf_res(5, mp->m_sb.sb_sectsize) +
(2 * mp->m_sb.sb_sectsize + xfs_calc_buf_res(XFS_ALLOCFREE_LOG_COUNT(mp, 2),
2 * mp->m_sb.sb_sectsize + XFS_FSB_TO_B(mp, 1))));
mp->m_sb.sb_sectsize +
XFS_ALLOCFREE_LOG_RES(mp, 2) +
128 * (5 + XFS_ALLOCFREE_LOG_COUNT(mp, 2))));
} }
/* /*
...@@ -148,18 +145,17 @@ xfs_calc_itruncate_reservation( ...@@ -148,18 +145,17 @@ xfs_calc_itruncate_reservation(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
return XFS_DQUOT_LOGRES(mp) + return XFS_DQUOT_LOGRES(mp) +
MAX((mp->m_sb.sb_inodesize + MAX((xfs_calc_buf_res(1, mp->m_sb.sb_inodesize) +
XFS_FSB_TO_B(mp, XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK) + 1) + xfs_calc_buf_res(XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK) + 1,
128 * (2 + XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK))), XFS_FSB_TO_B(mp, 1))),
(4 * mp->m_sb.sb_sectsize + (xfs_calc_buf_res(9, mp->m_sb.sb_sectsize) +
4 * mp->m_sb.sb_sectsize + xfs_calc_buf_res(XFS_ALLOCFREE_LOG_COUNT(mp, 4),
mp->m_sb.sb_sectsize + XFS_FSB_TO_B(mp, 1)) +
XFS_ALLOCFREE_LOG_RES(mp, 4) + xfs_calc_buf_res(5, 0) +
128 * (9 + XFS_ALLOCFREE_LOG_COUNT(mp, 4)) + xfs_calc_buf_res(XFS_ALLOCFREE_LOG_COUNT(mp, 1),
128 * 5 + XFS_FSB_TO_B(mp, 1)) +
XFS_ALLOCFREE_LOG_RES(mp, 1) + xfs_calc_buf_res(2 + XFS_IALLOC_BLOCKS(mp) +
128 * (2 + XFS_IALLOC_BLOCKS(mp) + mp->m_in_maxlevels + mp->m_in_maxlevels, 0)));
XFS_ALLOCFREE_LOG_COUNT(mp, 1))));
} }
/* /*
...@@ -179,14 +175,12 @@ xfs_calc_rename_reservation( ...@@ -179,14 +175,12 @@ xfs_calc_rename_reservation(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
return XFS_DQUOT_LOGRES(mp) + return XFS_DQUOT_LOGRES(mp) +
MAX((4 * mp->m_sb.sb_inodesize + MAX((xfs_calc_buf_res(4, mp->m_sb.sb_inodesize) +
2 * XFS_DIROP_LOG_RES(mp) + xfs_calc_buf_res(2 * XFS_DIROP_LOG_COUNT(mp),
128 * (4 + 2 * XFS_DIROP_LOG_COUNT(mp))), XFS_FSB_TO_B(mp, 1))),
(3 * mp->m_sb.sb_sectsize + (xfs_calc_buf_res(7, mp->m_sb.sb_sectsize) +
3 * mp->m_sb.sb_sectsize + xfs_calc_buf_res(XFS_ALLOCFREE_LOG_COUNT(mp, 3),
mp->m_sb.sb_sectsize + XFS_FSB_TO_B(mp, 1))));
XFS_ALLOCFREE_LOG_RES(mp, 3) +
128 * (7 + XFS_ALLOCFREE_LOG_COUNT(mp, 3))));
} }
/* /*
...@@ -206,15 +200,12 @@ xfs_calc_link_reservation( ...@@ -206,15 +200,12 @@ xfs_calc_link_reservation(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
return XFS_DQUOT_LOGRES(mp) + return XFS_DQUOT_LOGRES(mp) +
MAX((mp->m_sb.sb_inodesize + MAX((xfs_calc_buf_res(2, mp->m_sb.sb_inodesize) +
mp->m_sb.sb_inodesize + xfs_calc_buf_res(XFS_DIROP_LOG_COUNT(mp),
XFS_DIROP_LOG_RES(mp) + XFS_FSB_TO_B(mp, 1))),
128 * (2 + XFS_DIROP_LOG_COUNT(mp))), (xfs_calc_buf_res(3, mp->m_sb.sb_sectsize) +
(mp->m_sb.sb_sectsize + xfs_calc_buf_res(XFS_ALLOCFREE_LOG_COUNT(mp, 1),
mp->m_sb.sb_sectsize + XFS_FSB_TO_B(mp, 1))));
mp->m_sb.sb_sectsize +
XFS_ALLOCFREE_LOG_RES(mp, 1) +
128 * (3 + XFS_ALLOCFREE_LOG_COUNT(mp, 1))));
} }
/* /*
...@@ -234,15 +225,12 @@ xfs_calc_remove_reservation( ...@@ -234,15 +225,12 @@ xfs_calc_remove_reservation(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
return XFS_DQUOT_LOGRES(mp) + return XFS_DQUOT_LOGRES(mp) +
MAX((mp->m_sb.sb_inodesize + MAX((xfs_calc_buf_res(2, mp->m_sb.sb_inodesize) +
mp->m_sb.sb_inodesize + xfs_calc_buf_res(XFS_DIROP_LOG_COUNT(mp),
XFS_DIROP_LOG_RES(mp) + XFS_FSB_TO_B(mp, 1))),
128 * (2 + XFS_DIROP_LOG_COUNT(mp))), (xfs_calc_buf_res(5, mp->m_sb.sb_sectsize) +
(2 * mp->m_sb.sb_sectsize + xfs_calc_buf_res(XFS_ALLOCFREE_LOG_COUNT(mp, 2),
2 * mp->m_sb.sb_sectsize + XFS_FSB_TO_B(mp, 1))));
mp->m_sb.sb_sectsize +
XFS_ALLOCFREE_LOG_RES(mp, 2) +
128 * (5 + XFS_ALLOCFREE_LOG_COUNT(mp, 2))));
} }
/* /*
...@@ -264,18 +252,18 @@ xfs_calc_symlink_reservation( ...@@ -264,18 +252,18 @@ xfs_calc_symlink_reservation(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
return XFS_DQUOT_LOGRES(mp) + return XFS_DQUOT_LOGRES(mp) +
MAX((mp->m_sb.sb_inodesize + MAX((xfs_calc_buf_res(2, mp->m_sb.sb_inodesize) +
mp->m_sb.sb_inodesize + xfs_calc_buf_res(1, XFS_FSB_TO_B(mp, 1)) +
XFS_FSB_TO_B(mp, 1) + xfs_calc_buf_res(XFS_DIROP_LOG_COUNT(mp),
XFS_DIROP_LOG_RES(mp) + XFS_FSB_TO_B(mp, 1)) +
1024 + xfs_calc_buf_res(1, 1024)),
128 * (4 + XFS_DIROP_LOG_COUNT(mp))), (xfs_calc_buf_res(2, mp->m_sb.sb_sectsize) +
(2 * mp->m_sb.sb_sectsize + xfs_calc_buf_res(XFS_IALLOC_BLOCKS(mp),
XFS_FSB_TO_B(mp, XFS_IALLOC_BLOCKS(mp)) + XFS_FSB_TO_B(mp, 1)) +
XFS_FSB_TO_B(mp, mp->m_in_maxlevels) + xfs_calc_buf_res(mp->m_in_maxlevels,
XFS_ALLOCFREE_LOG_RES(mp, 1) + XFS_FSB_TO_B(mp, 1)) +
128 * (2 + XFS_IALLOC_BLOCKS(mp) + mp->m_in_maxlevels + xfs_calc_buf_res(XFS_ALLOCFREE_LOG_COUNT(mp, 1),
XFS_ALLOCFREE_LOG_COUNT(mp, 1)))); XFS_FSB_TO_B(mp, 1))));
} }
/* /*
...@@ -298,18 +286,19 @@ xfs_calc_create_reservation( ...@@ -298,18 +286,19 @@ xfs_calc_create_reservation(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
return XFS_DQUOT_LOGRES(mp) + return XFS_DQUOT_LOGRES(mp) +
MAX((mp->m_sb.sb_inodesize + MAX((xfs_calc_buf_res(2, mp->m_sb.sb_inodesize) +
mp->m_sb.sb_inodesize + xfs_calc_buf_res(1, mp->m_sb.sb_sectsize) +
(uint)XFS_FSB_TO_B(mp, 1) +
xfs_calc_buf_res(XFS_DIROP_LOG_COUNT(mp),
XFS_FSB_TO_B(mp, 1))),
(xfs_calc_buf_res(2, mp->m_sb.sb_sectsize) +
mp->m_sb.sb_sectsize + mp->m_sb.sb_sectsize +
XFS_FSB_TO_B(mp, 1) + xfs_calc_buf_res(XFS_IALLOC_BLOCKS(mp),
XFS_DIROP_LOG_RES(mp) + XFS_FSB_TO_B(mp, 1)) +
128 * (3 + XFS_DIROP_LOG_COUNT(mp))), xfs_calc_buf_res(mp->m_in_maxlevels,
(3 * mp->m_sb.sb_sectsize + XFS_FSB_TO_B(mp, 1)) +
XFS_FSB_TO_B(mp, XFS_IALLOC_BLOCKS(mp)) + xfs_calc_buf_res(XFS_ALLOCFREE_LOG_COUNT(mp, 1),
XFS_FSB_TO_B(mp, mp->m_in_maxlevels) + XFS_FSB_TO_B(mp, 1))));
XFS_ALLOCFREE_LOG_RES(mp, 1) +
128 * (2 + XFS_IALLOC_BLOCKS(mp) + mp->m_in_maxlevels +
XFS_ALLOCFREE_LOG_COUNT(mp, 1))));
} }
/* /*
...@@ -337,16 +326,16 @@ xfs_calc_ifree_reservation( ...@@ -337,16 +326,16 @@ xfs_calc_ifree_reservation(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
return XFS_DQUOT_LOGRES(mp) + return XFS_DQUOT_LOGRES(mp) +
mp->m_sb.sb_inodesize + xfs_calc_buf_res(1, mp->m_sb.sb_inodesize) +
mp->m_sb.sb_sectsize + xfs_calc_buf_res(2, mp->m_sb.sb_sectsize) +
mp->m_sb.sb_sectsize + xfs_calc_buf_res(1, XFS_FSB_TO_B(mp, 1)) +
XFS_FSB_TO_B(mp, 1) +
MAX((__uint16_t)XFS_FSB_TO_B(mp, 1), MAX((__uint16_t)XFS_FSB_TO_B(mp, 1),
XFS_INODE_CLUSTER_SIZE(mp)) + XFS_INODE_CLUSTER_SIZE(mp)) +
128 * 5 + xfs_calc_buf_res(1, 0) +
XFS_ALLOCFREE_LOG_RES(mp, 1) + xfs_calc_buf_res(2 + XFS_IALLOC_BLOCKS(mp) +
128 * (2 + XFS_IALLOC_BLOCKS(mp) + mp->m_in_maxlevels + mp->m_in_maxlevels, 0) +
XFS_ALLOCFREE_LOG_COUNT(mp, 1)); xfs_calc_buf_res(XFS_ALLOCFREE_LOG_COUNT(mp, 1),
XFS_FSB_TO_B(mp, 1));
} }
/* /*
...@@ -374,9 +363,9 @@ STATIC uint ...@@ -374,9 +363,9 @@ STATIC uint
xfs_calc_growdata_reservation( xfs_calc_growdata_reservation(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
return mp->m_sb.sb_sectsize * 3 + return xfs_calc_buf_res(3, mp->m_sb.sb_sectsize) +
XFS_ALLOCFREE_LOG_RES(mp, 1) + xfs_calc_buf_res(XFS_ALLOCFREE_LOG_COUNT(mp, 1),
128 * (3 + XFS_ALLOCFREE_LOG_COUNT(mp, 1)); XFS_FSB_TO_B(mp, 1));
} }
/* /*
...@@ -393,12 +382,12 @@ STATIC uint ...@@ -393,12 +382,12 @@ STATIC uint
xfs_calc_growrtalloc_reservation( xfs_calc_growrtalloc_reservation(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
return 2 * mp->m_sb.sb_sectsize + return xfs_calc_buf_res(2, mp->m_sb.sb_sectsize) +
XFS_FSB_TO_B(mp, XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK)) + xfs_calc_buf_res(XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK),
mp->m_sb.sb_inodesize + XFS_FSB_TO_B(mp, 1)) +
XFS_ALLOCFREE_LOG_RES(mp, 1) + xfs_calc_buf_res(1, mp->m_sb.sb_inodesize) +
128 * (3 + XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK) + xfs_calc_buf_res(XFS_ALLOCFREE_LOG_COUNT(mp, 1),
XFS_ALLOCFREE_LOG_COUNT(mp, 1)); XFS_FSB_TO_B(mp, 1));
} }
/* /*
...@@ -410,7 +399,7 @@ STATIC uint ...@@ -410,7 +399,7 @@ STATIC uint
xfs_calc_growrtzero_reservation( xfs_calc_growrtzero_reservation(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
return mp->m_sb.sb_blocksize + 128; return xfs_calc_buf_res(1, mp->m_sb.sb_blocksize);
} }
/* /*
...@@ -427,11 +416,10 @@ STATIC uint ...@@ -427,11 +416,10 @@ STATIC uint
xfs_calc_growrtfree_reservation( xfs_calc_growrtfree_reservation(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
return mp->m_sb.sb_sectsize + return xfs_calc_buf_res(1, mp->m_sb.sb_sectsize) +
2 * mp->m_sb.sb_inodesize + xfs_calc_buf_res(2, mp->m_sb.sb_inodesize) +
mp->m_sb.sb_blocksize + xfs_calc_buf_res(1, mp->m_sb.sb_blocksize) +
mp->m_rsumsize + xfs_calc_buf_res(1, mp->m_rsumsize);
128 * 5;
} }
/* /*
...@@ -442,7 +430,7 @@ STATIC uint ...@@ -442,7 +430,7 @@ STATIC uint
xfs_calc_swrite_reservation( xfs_calc_swrite_reservation(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
return mp->m_sb.sb_inodesize + 128; return xfs_calc_buf_res(1, mp->m_sb.sb_inodesize);
} }
/* /*
...@@ -452,7 +440,7 @@ xfs_calc_swrite_reservation( ...@@ -452,7 +440,7 @@ xfs_calc_swrite_reservation(
STATIC uint STATIC uint
xfs_calc_writeid_reservation(xfs_mount_t *mp) xfs_calc_writeid_reservation(xfs_mount_t *mp)
{ {
return mp->m_sb.sb_inodesize + 128; return xfs_calc_buf_res(1, mp->m_sb.sb_inodesize);
} }
/* /*
...@@ -468,13 +456,13 @@ xfs_calc_addafork_reservation( ...@@ -468,13 +456,13 @@ xfs_calc_addafork_reservation(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
return XFS_DQUOT_LOGRES(mp) + return XFS_DQUOT_LOGRES(mp) +
mp->m_sb.sb_inodesize + xfs_calc_buf_res(1, mp->m_sb.sb_inodesize) +
mp->m_sb.sb_sectsize * 2 + xfs_calc_buf_res(2, mp->m_sb.sb_sectsize) +
mp->m_dirblksize + xfs_calc_buf_res(1, mp->m_dirblksize) +
XFS_FSB_TO_B(mp, XFS_DAENTER_BMAP1B(mp, XFS_DATA_FORK) + 1) + xfs_calc_buf_res(XFS_DAENTER_BMAP1B(mp, XFS_DATA_FORK) + 1,
XFS_ALLOCFREE_LOG_RES(mp, 1) + XFS_FSB_TO_B(mp, 1)) +
128 * (4 + XFS_DAENTER_BMAP1B(mp, XFS_DATA_FORK) + 1 + xfs_calc_buf_res(XFS_ALLOCFREE_LOG_COUNT(mp, 1),
XFS_ALLOCFREE_LOG_COUNT(mp, 1)); XFS_FSB_TO_B(mp, 1));
} }
/* /*
...@@ -492,14 +480,12 @@ STATIC uint ...@@ -492,14 +480,12 @@ STATIC uint
xfs_calc_attrinval_reservation( xfs_calc_attrinval_reservation(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
return MAX((mp->m_sb.sb_inodesize + return MAX((xfs_calc_buf_res(1, mp->m_sb.sb_inodesize) +
XFS_FSB_TO_B(mp, XFS_BM_MAXLEVELS(mp, XFS_ATTR_FORK)) + xfs_calc_buf_res(XFS_BM_MAXLEVELS(mp, XFS_ATTR_FORK),
128 * (1 + XFS_BM_MAXLEVELS(mp, XFS_ATTR_FORK))), XFS_FSB_TO_B(mp, 1))),
(4 * mp->m_sb.sb_sectsize + (xfs_calc_buf_res(9, mp->m_sb.sb_sectsize) +
4 * mp->m_sb.sb_sectsize + xfs_calc_buf_res(XFS_ALLOCFREE_LOG_COUNT(mp, 4),
mp->m_sb.sb_sectsize + XFS_FSB_TO_B(mp, 1))));
XFS_ALLOCFREE_LOG_RES(mp, 4) +
128 * (9 + XFS_ALLOCFREE_LOG_COUNT(mp, 4))));
} }
/* /*
...@@ -517,10 +503,9 @@ xfs_calc_attrset_reservation( ...@@ -517,10 +503,9 @@ xfs_calc_attrset_reservation(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
return XFS_DQUOT_LOGRES(mp) + return XFS_DQUOT_LOGRES(mp) +
mp->m_sb.sb_inodesize + xfs_calc_buf_res(1, mp->m_sb.sb_inodesize) +
mp->m_sb.sb_sectsize + xfs_calc_buf_res(1, mp->m_sb.sb_sectsize) +
XFS_FSB_TO_B(mp, XFS_DA_NODE_MAXDEPTH) + xfs_calc_buf_res(XFS_DA_NODE_MAXDEPTH, XFS_FSB_TO_B(mp, 1));
128 * (2 + XFS_DA_NODE_MAXDEPTH);
} }
/* /*
...@@ -539,16 +524,15 @@ xfs_calc_attrrm_reservation( ...@@ -539,16 +524,15 @@ xfs_calc_attrrm_reservation(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
return XFS_DQUOT_LOGRES(mp) + return XFS_DQUOT_LOGRES(mp) +
MAX((mp->m_sb.sb_inodesize + MAX((xfs_calc_buf_res(1, mp->m_sb.sb_inodesize) +
XFS_FSB_TO_B(mp, XFS_DA_NODE_MAXDEPTH) + xfs_calc_buf_res(XFS_DA_NODE_MAXDEPTH,
XFS_FSB_TO_B(mp, XFS_BM_MAXLEVELS(mp, XFS_ATTR_FORK)) + XFS_FSB_TO_B(mp, 1)) +
128 * (1 + XFS_DA_NODE_MAXDEPTH + (uint)XFS_FSB_TO_B(mp,
XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK))), XFS_BM_MAXLEVELS(mp, XFS_ATTR_FORK)) +
(2 * mp->m_sb.sb_sectsize + xfs_calc_buf_res(XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK), 0)),
2 * mp->m_sb.sb_sectsize + (xfs_calc_buf_res(5, mp->m_sb.sb_sectsize) +
mp->m_sb.sb_sectsize + xfs_calc_buf_res(XFS_ALLOCFREE_LOG_COUNT(mp, 2),
XFS_ALLOCFREE_LOG_RES(mp, 2) + XFS_FSB_TO_B(mp, 1))));
128 * (5 + XFS_ALLOCFREE_LOG_COUNT(mp, 2))));
} }
/* /*
...@@ -558,7 +542,7 @@ STATIC uint ...@@ -558,7 +542,7 @@ STATIC uint
xfs_calc_clear_agi_bucket_reservation( xfs_calc_clear_agi_bucket_reservation(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
return mp->m_sb.sb_sectsize + 128; return xfs_calc_buf_res(1, mp->m_sb.sb_sectsize);
} }
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7