Force merge creation timeout

Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
2024-01-25 12:46:46 -08:00
parent 8d3e6883c6
commit dcfd22e4b1

View File

@@ -1200,7 +1200,7 @@ static int finalize_and_start_log_merge(struct super_block *sb, struct scoutfs_l
mutex_lock(&server->logs_mutex);
/* done if we timed out */
if (time_after(jiffies, timeo)) {
if (1 || time_after(jiffies, timeo)) {
ret = 0;
break;
}