diff options
| author |   visa <visa@openbsd.org> | 2019-12-02 15:02:32 +0000 |
|---|---|---|
| committer | visa <visa@openbsd.org> | 2019-12-02 15:02:32 +0000 |
| commit | dfee912fcead06bd42f2c0f50b9ece0eb245384d (patch) | |
| tree | 152a5474d3765d9dbe95c7e45e7aa477e1f0bd6f | |
| parent | Remove now unneeded kernel locking from vfs_lockf.c. (diff) | |
| download | wireguard-openbsd-dfee912fcead06bd42f2c0f50b9ece0eb245384d.tar.xz wireguard-openbsd-dfee912fcead06bd42f2c0f50b9ece0eb245384d.zip | |
Replace rwsleep(9) with rwsleep_nsec(9) in vfs_lockf.c.
Prompted by and OK cheloha@
OK mpi@ anton@
| -rw-r--r-- | sys/kern/vfs_lockf.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/kern/vfs_lockf.c b/sys/kern/vfs_lockf.c index 3b4b695b9de..1f3bab8849c 100644 --- a/sys/kern/vfs_lockf.c +++ b/sys/kern/vfs_lockf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_lockf.c,v 1.44 2019/12/02 15:01:18 visa Exp $ */ +/* $OpenBSD: vfs_lockf.c,v 1.45 2019/12/02 15:02:32 visa Exp $ */ /* $NetBSD: vfs_lockf.c,v 1.7 1996/02/04 02:18:21 christos Exp $ */ /* @@ -380,7 +380,8 @@ lf_setlock(struct lockf *lock) LFPRINT(("lf_setlock: blocking on", block), DEBUG_SETLOCK); TAILQ_INSERT_TAIL(&block->lf_blkhd, lock, lf_block); TAILQ_INSERT_TAIL(&lock->lf_state->ls_pending, lock, lf_entry); - error = rwsleep(lock, &lockf_lock, priority, "lockf", 0); + error = rwsleep_nsec(lock, &lockf_lock, priority, "lockf", + INFSLP); TAILQ_REMOVE(&lock->lf_state->ls_pending, lock, lf_entry); wakeup_one(lock->lf_state); if (lock->lf_blk != NULL) { @@ -739,7 +740,7 @@ lf_purgelocks(struct lockf_state **state) lf_wakelock(lock, F_INTR); } while (!TAILQ_EMPTY(&ls->ls_pending)) - rwsleep(ls, &lockf_lock, PLOCK, "lockfp", 0); + rwsleep_nsec(ls, &lockf_lock, PLOCK, "lockfp", INFSLP); /* * Any remaining locks cannot block other locks at this point and can |