mirror of
https://github.com/versity/scoutfs.git
synced 2026-01-10 05:37:25 +00:00
Force merge creation timeout
Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user