mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-09-05 15:47:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add btree total_above_join_low_water() test

Browse Source 
Take the condition used to decide if a btree block needs to be joined
and put it in total_above_join_low_water() so that btree_merging will be
able to call it to see if the leaf block it's merging into needs to be
joined.

Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
2021-06-17 09:36:00 -07:00
parent 3d1a0f06c0
commit ff882a4c4f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kmod/src/btree.c
+6 -1
View File
@@ -118,6 +118,11 @@ static unsigned int join_low_watermark(void)
return (SCOUTFS_BLOCK_LG_SIZE - sizeof(struct scoutfs_btree_block)) / 4;
}
static bool total_above_join_low_water(struct scoutfs_btree_block *bt)
{
return le16_to_cpu(bt->total_item_bytes) >= join_low_watermark();
}
/*
* return the integer percentages of total space the block could have
* consumed by items that is currently consumed.
@@ -814,7 +819,7 @@ static int try_join(struct super_block *sb,
int to_move;
int ret;
if (le16_to_cpu(bt->total_item_bytes) >= join_low_watermark())
if (total_above_join_low_water(bt))
return 0;
scoutfs_inc_counter(sb, btree_join);