Merge pull request #267 from versity/clk/merge_enoent

Handle ENOENT when getting log merge status item
This commit is contained in:
Zach Brown
2025-12-02 09:34:28 -08:00
committed by GitHub

View File

@@ -3036,7 +3036,13 @@ static int server_commit_log_merge(struct super_block *sb,
SCOUTFS_LOG_MERGE_STATUS_ZONE, 0, 0,
&stat, sizeof(stat));
if (ret < 0) {
err_str = "getting merge status item";
/*
* During a retransmission, it's possible that the server
* already committed and resolved this log merge. ENOENT
* is expected in that case.
*/
if (ret != -ENOENT)
err_str = "getting merge status item";
goto out;
}