mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2025-12-23 05:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #267 from versity/clk/merge_enoent

Browse Source 
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
parent 1c7678b6f5 ee630b164f
commit 6a9a6789d5
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kmod/src/server.c
View File

@@ -3036,7 +3036,13 @@ static int server_commit_log_merge(struct super_block *sb,
SCOUTFS_LOG_MERGE_STATUS_ZONE, 0, 0, SCOUTFS_LOG_MERGE_STATUS_ZONE, 0, 0,
&stat, sizeof(stat)); &stat, sizeof(stat));
if (ret < 0) { 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; goto out;
} }