diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_mbpool.c | 5 | ||||
| -rw-r--r-- | sys/kern/uipc_mbuf.c | 4 | ||||
| -rw-r--r-- | sys/kern/uipc_syscalls.c | 10 |
3 files changed, 7 insertions, 12 deletions
diff --git a/sys/kern/subr_mbpool.c b/sys/kern/subr_mbpool.c index 0b8cda62428f..bf52d8565653 100644 --- a/sys/kern/subr_mbpool.c +++ b/sys/kern/subr_mbpool.c @@ -283,12 +283,11 @@ mbp_free(struct mbpool *p, void *ptr) /* * Mbuf system external mbuf free routine */ -int +void mbp_ext_free(struct mbuf *m, void *buf, void *arg) { - mbp_free(arg, buf); - return (EXT_FREE_OK); + mbp_free(arg, buf); } /* diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 61ef0833ab48..512f48d6ea7d 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -255,7 +255,7 @@ m_freem(struct mbuf *mb) */ int m_extadd(struct mbuf *mb, caddr_t buf, u_int size, - int (*freef)(struct mbuf *, void *, void *), void *arg1, void *arg2, + void (*freef)(struct mbuf *, void *, void *), void *arg1, void *arg2, int flags, int type, int wait) { KASSERT(type != EXT_CLUSTER, ("%s: EXT_CLUSTER not allowed", __func__)); @@ -329,7 +329,7 @@ mb_free_ext(struct mbuf *m) case EXT_EXTREF: KASSERT(m->m_ext.ext_free != NULL, ("%s: ext_free not set", __func__)); - (void)(*(m->m_ext.ext_free))(m, m->m_ext.ext_arg1, + (*(m->m_ext.ext_free))(m, m->m_ext.ext_arg1, m->m_ext.ext_arg2); break; default: diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index f00d77fac8d0..2581d2c83999 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -1987,7 +1987,7 @@ filt_sfsync(struct knote *kn, long hint) /* * Detach mapped page and release resources back to the system. */ -int +void sf_buf_mext(struct mbuf *mb, void *addr, void *args) { vm_page_t m; @@ -2009,10 +2009,6 @@ sf_buf_mext(struct mbuf *mb, void *addr, void *args) sfs = addr; sf_sync_deref(sfs); } - /* - * sfs may be invalid at this point, don't use it! - */ - return (EXT_FREE_OK); } /* @@ -3066,14 +3062,14 @@ retry_space: m0 = m_get((mnw ? M_NOWAIT : M_WAITOK), MT_DATA); if (m0 == NULL) { error = (mnw ? EAGAIN : ENOBUFS); - (void)sf_buf_mext(NULL, NULL, sf); + sf_buf_mext(NULL, NULL, sf); break; } if (m_extadd(m0, (caddr_t )sf_buf_kva(sf), PAGE_SIZE, sf_buf_mext, sfs, sf, M_RDONLY, EXT_SFBUF, (mnw ? M_NOWAIT : M_WAITOK)) != 0) { error = (mnw ? EAGAIN : ENOBUFS); - (void)sf_buf_mext(NULL, NULL, sf); + sf_buf_mext(NULL, NULL, sf); m_freem(m0); break; } |