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

scoutfs: update srch _alloc_meta_low callers

Browse Source 
The srch system checks that is has allocator space while deleting srch
files and while merging them and dirtying output blocks.  Update the
callers to check for the correct number of avail or freed blocks that it
needs between each check.

Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
2020-12-02 09:25:13 -08:00
committed by Zach Brown
parent a5d9ac5514
commit ae286bf837
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kmod/src/srch.c
+8 -7
View File
@@ -1474,15 +1474,15 @@ out:
}
/*
* We're done with an operation when we have sufficient dirty blocks or
* run out of avail or freed allocator space.
* We should commit our progress when we have sufficient dirty blocks or
* don't have enough metadata alloc space for our caller's operations.
*/
static bool should_commit(struct super_block *sb, struct scoutfs_alloc *alloc,
struct scoutfs_block_writer *wri)
struct scoutfs_block_writer *wri, u32 nr)
{
return (scoutfs_block_writer_dirty_bytes(sb, wri) >=
SRCH_COMPACT_DIRTY_LIMIT_BYTES) ||
scoutfs_alloc_meta_low(sb, alloc, 8);
scoutfs_alloc_meta_low(sb, alloc, nr);
}
struct tourn_node {
@@ -1569,8 +1569,8 @@ static int kway_merge(struct super_block *sb,
goto out;
}
/* check for committing before dirtying blocks */
if (should_commit(sb, alloc, wri)) {
/* could grow and dirty to a leaf */
if (should_commit(sb, alloc, wri, sfl->height + 1)) {
ret = 0;
goto out;
}
@@ -2037,7 +2037,8 @@ static int delete_file(struct super_block *sb, struct scoutfs_alloc *alloc,
if (!blkno)
continue;
if (should_commit(sb, alloc, wri)) {
/* free below, then final root block */
if (should_commit(sb, alloc, wri, 2)) {
ret = 0;
goto out;
}