[RFC PATCH 05/11] xfs: update ifree transaction reservations for finobt

Brian Foster
2013-09-03T18:25:48Z

Update the ifree transaction log reservations to support the
finobt. An inode free can now mean an extra record modification,
record removal (i.e., inode chunk being freed) or a record
insertion (i.e., a previously full inode chunk).

Define XFS_IFREE_SPACE_RES() for the inactive transaction to
reserve data blocks for possible finobt merge/split situations.

Signed-off-by: Brian Foster <bfoster@redhat.com>
---
fs/xfs/xfs_trans_resv.c | 5 ++++-
fs/xfs/xfs_trans_space.h | 2 ++
2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/fs/xfs/xfs_trans_resv.c b/fs/xfs/xfs_trans_resv.c
index 3040dad..bbd393a 100644
--- a/fs/xfs/xfs_trans_resv.c
+++ b/fs/xfs/xfs_trans_resv.c
@@ -388,8 +388,10 @@ xfs_calc_symlink_reservation(
* the super block free inode counter: sector size
* the agi hash list and counters: sector size
* the inode btree entry: block size
+ * the free inode btree entry: block size
* the on disk inode before ours in the agi hash list: inode cluster size
* the inode btree: max depth * blocksize
+ * the free inode btree: max depth * block size
* the allocation btrees: 2 trees * (max depth - 1) * block size
*/
STATIC uint
@@ -399,12 +401,13 @@ xfs_calc_ifree_reservation(
return XFS_DQUOT_LOGRES(mp) +
xfs_calc_inode_res(mp, 1) +
xfs_calc_buf_res(2, mp->m_sb.sb_sectsize) +
- xfs_calc_buf_res(1, XFS_FSB_TO_B(mp, 1)) +
+ xfs_calc_buf_res(2, XFS_FSB_TO_B(mp, 1)) +
MAX((__uint16_t)XFS_FSB_TO_B(mp, 1),
XFS_INODE_CLUSTER_SIZE(mp)) +
xfs_calc_buf_res(1, 0) +
xfs_calc_buf_res(2 + XFS_IALLOC_BLOCKS(mp) +
mp->m_in_maxlevels, 0) +
+ xfs_calc_buf_res(mp->m_in_maxlevels, XFS_FSB_TO_B(mp, 1)) +
xfs_calc_buf_res(XFS_ALLOCFREE_LOG_COUNT(mp, 1),
XFS_FSB_TO_B(mp, 1));
}
diff --git a/fs/xfs/xfs_trans_space.h b/fs/xfs/xfs_trans_space.h
index 5dca732..4fc8c10 100644
--- a/fs/xfs/xfs_trans_space.h
+++ b/fs/xfs/xfs_trans_space.h
@@ -82,5 +82,7 @@
(XFS_DIRREMOVE_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl))
#define XFS_SYMLINK_SPACE_RES(mp,nl,b) \
(XFS_IALLOC_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl) + (b))
+#define XFS_IFREE_SPACE_RES(mp) \
+ (mp)->m_in_maxlevels

#endif /* __XFS_TRANS_SPACE_H__ */
--
1.8.1.4