Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge 7fc38a82d4 into 401c3563d4

This commit is contained in:
Matthew Ahrens 2024-01-29 13:08:34 -05:00 committed by GitHub
parent 401c3563d4 7fc38a82d4
commit 46c90ca304
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/os/linux/zfs/vdev_disk.c
View File

@ -370,10 +370,10 @@ vdev_disk_open(vdev_t *v, uint64_t *psize, uint64_t *max_psize,
if (v->vdev_removed) if (v->vdev_removed)
break; break;
schedule_timeout(MSEC_TO_TICK(10)); msleep(10);
} else if (unlikely(PTR_ERR(bdev) == -ERESTARTSYS)) { } else if (unlikely(PTR_ERR(bdev) == -ERESTARTSYS)) {
timeout = MSEC2NSEC(zfs_vdev_open_timeout_ms * 10); timeout = MSEC2NSEC(zfs_vdev_open_timeout_ms * 10);
continue; msleep(10);
} else if (IS_ERR(bdev)) { } else if (IS_ERR(bdev)) {
break; break;
} }

2
module/os/linux/zfs/zvol_os.c
View File

@ -769,7 +769,7 @@ retry:
if ((gethrtime() - start) > timeout) if ((gethrtime() - start) > timeout)
return (SET_ERROR(-ERESTARTSYS)); return (SET_ERROR(-ERESTARTSYS));
schedule_timeout(MSEC_TO_TICK(10)); msleep(10);
goto retry; goto retry;
#endif #endif
} else { } else {