mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-05-31 08:46:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix inconsistency assertions at commit_log_merge

Browse Source 
Only BUG_ON for inconsistency and not do it for commit errors
or failure to delete the original request.

Signed-off-by: Bryant G. Duffy-Ly <bduffyly@versity.com>
This commit is contained in:
Bryant G. Duffy-Ly
2021-11-03 07:50:47 -05:00
parent 65429a9cc4
commit cf4e6611d3
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kmod/src/server.c
View File

@@ -2426,7 +2426,9 @@ static int server_commit_log_merge(struct super_block *sb,
struct scoutfs_log_merge_range rng;
struct scoutfs_key key;
char *err_str = NULL;
int ret;
bool deleted = false;
int ret = 0;
int err = 0;
scoutfs_key_set_zeros(&rng.end);
@@ -2474,6 +2476,7 @@ static int server_commit_log_merge(struct super_block *sb,
err_str = "deleting orig request";
goto out;
}
deleted = true;
if (le64_to_cpu(comp->flags) & SCOUTFS_LOG_MERGE_COMP_ERROR) {
/* restore the range and reclaim the allocator if it failed */
@@ -2533,8 +2536,11 @@ out:
if (ret < 0)
scoutfs_err(sb, "error %d committing log merge: %s", ret, err_str);
ret = scoutfs_server_apply_commit(sb, ret);
BUG_ON(ret < 0); /* inconsistent */
err = scoutfs_server_apply_commit(sb, ret);
BUG_ON(ret < 0 && deleted); /* inconsistent */
if (ret == 0)
ret = err;
return scoutfs_net_response(sb, conn, cmd, id, ret, NULL, 0);
}