aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_dir2_node.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/xfs/xfs_dir2_node.c')
-rw-r--r--fs/xfs/xfs_dir2_node.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/xfs_dir2_node.c b/fs/xfs/xfs_dir2_node.c
index 853798519ae9..f90bf0690346 100644
--- a/fs/xfs/xfs_dir2_node.c
+++ b/fs/xfs/xfs_dir2_node.c
@@ -274,7 +274,7 @@ xfs_dir2_free_log_header(
274 ASSERT(free->hdr.magic == cpu_to_be32(XFS_DIR2_FREE_MAGIC) || 274 ASSERT(free->hdr.magic == cpu_to_be32(XFS_DIR2_FREE_MAGIC) ||
275 free->hdr.magic == cpu_to_be32(XFS_DIR3_FREE_MAGIC)); 275 free->hdr.magic == cpu_to_be32(XFS_DIR3_FREE_MAGIC));
276#endif 276#endif
277 xfs_trans_log_buf(tp, bp, 0, dp->d_ops->free_hdr_size() - 1); 277 xfs_trans_log_buf(tp, bp, 0, dp->d_ops->free_hdr_size - 1);
278} 278}
279 279
280/* 280/*
@@ -1268,7 +1268,7 @@ xfs_dir2_leafn_remove(
1268 * (usually). 1268 * (usually).
1269 */ 1269 */
1270 if (longest == mp->m_dirblksize - 1270 if (longest == mp->m_dirblksize -
1271 dp->d_ops->data_entry_offset()) { 1271 dp->d_ops->data_entry_offset) {
1272 /* 1272 /*
1273 * Try to punch out the data block. 1273 * Try to punch out the data block.
1274 */ 1274 */
@@ -1300,7 +1300,7 @@ xfs_dir2_leafn_remove(
1300 * Return indication of whether this leaf block is empty enough 1300 * Return indication of whether this leaf block is empty enough
1301 * to justify trying to join it with a neighbor. 1301 * to justify trying to join it with a neighbor.
1302 */ 1302 */
1303 *rval = (dp->d_ops->leaf_hdr_size() + 1303 *rval = (dp->d_ops->leaf_hdr_size +
1304 (uint)sizeof(ents[0]) * (leafhdr.count - leafhdr.stale)) < 1304 (uint)sizeof(ents[0]) * (leafhdr.count - leafhdr.stale)) <
1305 mp->m_dir_magicpct; 1305 mp->m_dir_magicpct;
1306 return 0; 1306 return 0;
@@ -1409,7 +1409,7 @@ xfs_dir2_leafn_toosmall(
1409 xfs_dir3_leaf_check(dp, blk->bp); 1409 xfs_dir3_leaf_check(dp, blk->bp);
1410 1410
1411 count = leafhdr.count - leafhdr.stale; 1411 count = leafhdr.count - leafhdr.stale;
1412 bytes = dp->d_ops->leaf_hdr_size() + count * sizeof(ents[0]); 1412 bytes = dp->d_ops->leaf_hdr_size + count * sizeof(ents[0]);
1413 if (bytes > (state->blocksize >> 1)) { 1413 if (bytes > (state->blocksize >> 1)) {
1414 /* 1414 /*
1415 * Blk over 50%, don't try to join. 1415 * Blk over 50%, don't try to join.