From 533b675ec821c663418154d1b097e4acc35fffef Mon Sep 17 00:00:00 2001
From: tiaoxizhan <tiaoxizhan@outlook.com>
Date: Thu, 6 Mar 2025 22:36:33 +0800
Subject: [PATCH] fix: fix the wrong error return value (#6603)

---
 weed/server/filer_server_handlers_write_merge.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weed/server/filer_server_handlers_write_merge.go b/weed/server/filer_server_handlers_write_merge.go
index b3ccd4cc1..2110f485a 100644
--- a/weed/server/filer_server_handlers_write_merge.go
+++ b/weed/server/filer_server_handlers_write_merge.go
@@ -58,7 +58,7 @@ func (fs *FilerServer) mergeChunks(so *operation.StorageOption, inputChunks []*f
 	if err != nil {
 		glog.Errorf("Failed to resolve old entry chunks when delete old entry chunks. new: %s, old: %s",
 			mergedChunks, inputChunks)
-		return
+		return mergedChunks, err
 	}
 	fs.filer.DeleteChunksNotRecursive(garbage)
 	return