From ebede8ab83cb9d8addc53d415e49d459989b71ff Mon Sep 17 00:00:00 2001 From: mvs Date: Sun, 12 Feb 2023 10:41:00 +0000 Subject: [PATCH] Rename pipeselwakeup() to pipe_wakeup(). It doesn't call selwakeup() anymore, so do it to be consistent with similar *wakeup() functions. No functional changes. ok visa@ --- sys/kern/sys_pipe.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 80c401bf6f5..8958157f18c 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_pipe.c,v 1.144 2023/02/10 14:34:17 visa Exp $ */ +/* $OpenBSD: sys_pipe.c,v 1.145 2023/02/12 10:41:00 mvs Exp $ */ /* * Copyright (c) 1996 John S. Dyson @@ -124,7 +124,7 @@ static unsigned int amountpipekva; struct pool pipe_pair_pool; int dopipe(struct proc *, int *, int); -void pipeselwakeup(struct pipe *); +void pipe_wakeup(struct pipe *); int pipe_create(struct pipe *); void pipe_destroy(struct pipe *); @@ -366,7 +366,7 @@ pipe_iosleep(struct pipe *cpipe, const char *wmesg) } void -pipeselwakeup(struct pipe *cpipe) +pipe_wakeup(struct pipe *cpipe) { rw_assert_wrlock(cpipe->pipe_lock); @@ -470,7 +470,7 @@ unlocked_error: } if (rpipe->pipe_buffer.size - rpipe->pipe_buffer.cnt >= PIPE_BUF) - pipeselwakeup(rpipe); + pipe_wakeup(rpipe); rw_exit_write(rpipe->pipe_lock); return (error); @@ -615,7 +615,7 @@ pipe_write(struct file *fp, struct uio *uio, int fflags) * We have no more space and have something to offer, * wake up select/poll. */ - pipeselwakeup(wpipe); + pipe_wakeup(wpipe); wpipe->pipe_state |= PIPE_WANTW; error = pipe_iosleep(wpipe, "pipewr"); @@ -659,7 +659,7 @@ unlocked_error: getnanotime(&wpipe->pipe_mtime); /* We have something to offer, wake up select/poll. */ if (wpipe->pipe_buffer.cnt) - pipeselwakeup(wpipe); + pipe_wakeup(wpipe); rw_exit_write(lock); return (error); @@ -791,7 +791,7 @@ pipe_destroy(struct pipe *cpipe) rw_enter_write(cpipe->pipe_lock); - pipeselwakeup(cpipe); + pipe_wakeup(cpipe); sigio_free(&cpipe->pipe_sigio); /* @@ -807,7 +807,7 @@ pipe_destroy(struct pipe *cpipe) /* Disconnect from peer. */ if ((ppipe = cpipe->pipe_peer) != NULL) { - pipeselwakeup(ppipe); + pipe_wakeup(ppipe); ppipe->pipe_state |= PIPE_EOF; wakeup(ppipe); -- 2.20.1