diff options
| -rw-r--r-- | sys/kern/kern_event.c | 14 | ||||
| -rw-r--r-- | sys/kern/sys_pipe.c | 4 | ||||
| -rw-r--r-- | sys/kern/uipc_socket.c | 10 | ||||
| -rw-r--r-- | sys/miscfs/fifofs/fifo_vnops.c | 8 | ||||
| -rw-r--r-- | sys/net/bpf.c | 4 | ||||
| -rw-r--r-- | sys/sys/event.h | 4 |
6 files changed, 22 insertions, 22 deletions
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 25a438f7709..64c6131090c 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_event.c,v 1.180 2022/02/11 07:25:50 visa Exp $ */ +/* $OpenBSD: kern_event.c,v 1.181 2022/02/13 12:58:46 visa Exp $ */ /*- * Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org> @@ -304,7 +304,7 @@ filt_kqueuemodify(struct kevent *kev, struct knote *kn) int active; mtx_enter(&kq->kq_lock); - knote_modify(kev, kn); + knote_assign(kev, kn); active = filt_kqueue_common(kn, kq); mtx_leave(&kq->kq_lock); @@ -541,7 +541,7 @@ filt_timermodify(struct kevent *kev, struct knote *kn) mtx_leave(&kq->kq_lock); kn->kn_data = 0; - knote_modify(kev, kn); + knote_assign(kev, kn); /* Reinit timeout to invoke tick adjustment again. */ timeout_set(to, filt_timerexpire, kn); filt_timer_timeout_add(kn); @@ -585,7 +585,7 @@ filt_seltrue(struct knote *kn, long hint) int filt_seltruemodify(struct kevent *kev, struct knote *kn) { - knote_modify(kev, kn); + knote_assign(kev, kn); return (kn->kn_fop->f_event(kn, 0)); } @@ -739,7 +739,7 @@ filter_modify(struct kevent *kev, struct knote *kn) } else { /* Emulate f_modify using f_event. */ s = splhigh(); - knote_modify(kev, kn); + knote_assign(kev, kn); active = kn->kn_fop->f_event(kn, 0); splx(s); } @@ -2010,12 +2010,12 @@ knote_dequeue(struct knote *kn) } /* - * Modify the knote's parameters. + * Assign parameters to the knote. * * The knote's object lock must be held. */ void -knote_modify(const struct kevent *kev, struct knote *kn) +knote_assign(const struct kevent *kev, struct knote *kn) { if ((kn->kn_fop->f_flags & FILTEROP_MPSAFE) == 0) KERNEL_ASSERT_LOCKED(); diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 92527b26646..cf7912dbe12 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_pipe.c,v 1.134 2022/02/12 14:07:26 visa Exp $ */ +/* $OpenBSD: sys_pipe.c,v 1.135 2022/02/13 12:58:46 visa Exp $ */ /* * Copyright (c) 1996 John S. Dyson @@ -1015,7 +1015,7 @@ filt_pipemodify(struct kevent *kev, struct knote *kn) int active; rw_enter_write(rpipe->pipe_lock); - knote_modify(kev, kn); + knote_assign(kev, kn); active = kn->kn_fop->f_event(kn, 0); rw_exit_write(rpipe->pipe_lock); diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index b41721562f2..f34c3216878 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket.c,v 1.271 2021/12/24 06:50:16 visa Exp $ */ +/* $OpenBSD: uipc_socket.c,v 1.272 2022/02/13 12:58:46 visa Exp $ */ /* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */ /* @@ -2142,7 +2142,7 @@ filt_soreadmodify(struct kevent *kev, struct knote *kn) int rv, s; s = solock(so); - knote_modify(kev, kn); + knote_assign(kev, kn); rv = filt_soread_common(kn, so); sounlock(so, s); @@ -2220,7 +2220,7 @@ filt_sowritemodify(struct kevent *kev, struct knote *kn) int rv, s; s = solock(so); - knote_modify(kev, kn); + knote_assign(kev, kn); rv = filt_sowrite_common(kn, so); sounlock(so, s); @@ -2290,7 +2290,7 @@ filt_soexceptmodify(struct kevent *kev, struct knote *kn) int rv, s; s = solock(so); - knote_modify(kev, kn); + knote_assign(kev, kn); rv = filt_soexcept_common(kn, so); sounlock(so, s); @@ -2352,7 +2352,7 @@ filt_solistenmodify(struct kevent *kev, struct knote *kn) int rv, s; s = solock(so); - knote_modify(kev, kn); + knote_assign(kev, kn); rv = filt_solisten_common(kn, so); sounlock(so, s); diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c index 1ac3a990132..88f2ca26c9f 100644 --- a/sys/miscfs/fifofs/fifo_vnops.c +++ b/sys/miscfs/fifofs/fifo_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fifo_vnops.c,v 1.90 2021/12/14 15:53:42 visa Exp $ */ +/* $OpenBSD: fifo_vnops.c,v 1.91 2022/02/13 12:58:46 visa Exp $ */ /* $NetBSD: fifo_vnops.c,v 1.18 1996/03/16 23:52:42 christos Exp $ */ /* @@ -611,7 +611,7 @@ filt_fiforeadmodify(struct kevent *kev, struct knote *kn) int rv, s; s = solock(so); - knote_modify(kev, kn); + knote_assign(kev, kn); rv = filt_fiforead_common(kn, so); sounlock(so, s); @@ -678,7 +678,7 @@ filt_fifowritemodify(struct kevent *kev, struct knote *kn) int rv, s; s = solock(so); - knote_modify(kev, kn); + knote_assign(kev, kn); rv = filt_fifowrite_common(kn, so); sounlock(so, s); @@ -737,7 +737,7 @@ filt_fifoexceptmodify(struct kevent *kev, struct knote *kn) int rv, s; s = solock(so); - knote_modify(kev, kn); + knote_assign(kev, kn); rv = filt_fifoexcept_common(kn, so); sounlock(so, s); diff --git a/sys/net/bpf.c b/sys/net/bpf.c index ce0fa81de22..2d0d069d27c 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bpf.c,v 1.212 2022/02/11 07:28:29 visa Exp $ */ +/* $OpenBSD: bpf.c,v 1.213 2022/02/13 12:58:46 visa Exp $ */ /* $NetBSD: bpf.c,v 1.33 1997/02/21 23:59:35 thorpej Exp $ */ /* @@ -1257,7 +1257,7 @@ filt_bpfreadmodify(struct kevent *kev, struct knote *kn) int active; mtx_enter(&d->bd_mtx); - knote_modify(kev, kn); + knote_assign(kev, kn); active = filt_bpfread_common(kn, d); mtx_leave(&d->bd_mtx); diff --git a/sys/sys/event.h b/sys/sys/event.h index eb00575fc70..2ec51183892 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -1,4 +1,4 @@ -/* $OpenBSD: event.h,v 1.64 2022/02/11 07:27:07 visa Exp $ */ +/* $OpenBSD: event.h,v 1.65 2022/02/13 12:58:46 visa Exp $ */ /*- * Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org> @@ -294,7 +294,7 @@ extern void kqpoll_exit(void); extern void knote(struct klist *list, long hint); extern void knote_fdclose(struct proc *p, int fd); extern void knote_processexit(struct proc *); -extern void knote_modify(const struct kevent *, struct knote *); +extern void knote_assign(const struct kevent *, struct knote *); extern void knote_submit(struct knote *, struct kevent *); extern void kqueue_init(void); extern void kqueue_init_percpu(void); |