diff options
| author | ngie <ngie@FreeBSD.org> | 2015-11-23 08:52:38 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-11-23 08:52:38 +0000 |
| commit | 83975b81667218185ffd807ab1386b9856d10e4c (patch) | |
| tree | 79d66f5ce3b1b5b438532b72a109392d1dffd5dd /contrib/netbsd-tests | |
| parent | 243e40ca7903af22f673885944979008bd9c7d1d (diff) | |
| download | FreeBSD-src-83975b81667218185ffd807ab1386b9856d10e4c.zip FreeBSD-src-83975b81667218185ffd807ab1386b9856d10e4c.tar.gz | |
MFC r290911,r290912:
r290911:
Ignore EINTR from usleep(3) in try_locks(..)
NetBSD's usleep(3) only returns -1/sets errno=EINVAL when `microseconds`
is one million or more
Submitted by: pho
Sponsored by: EMC / Isilon Storage Division
r290912:
Integrate contrib/netbsd-tests/kernel/t_lockf.c into the FreeBSD test suite as
tests/sys/kern/lockf_test
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'contrib/netbsd-tests')
| -rw-r--r-- | contrib/netbsd-tests/kernel/t_lockf.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/netbsd-tests/kernel/t_lockf.c b/contrib/netbsd-tests/kernel/t_lockf.c index d937301..702e612 100644 --- a/contrib/netbsd-tests/kernel/t_lockf.c +++ b/contrib/netbsd-tests/kernel/t_lockf.c @@ -102,6 +102,9 @@ trylocks(int id) (void)fcntl(fd, F_SETLKW, &fl); if (usleep(sleeptime) < 0) +#if defined(__FreeBSD__) + if (errno != EINTR) +#endif err(1, "usleep"); } printf("%d: done\n", id); |
