diff options
| -rw-r--r-- | sys/kern/sys_pipe.c | 7 | ||||
| -rw-r--r-- | sys/sys/pipe.h | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 2d0db5b..7d39b8c 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -213,8 +213,10 @@ SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_ANY, pipeinit, NULL); static void pipeinit(void *dummy __unused) { + pipe_zone = uma_zcreate("PIPE", sizeof(struct pipe), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + KASSERT(pipe_zone != NULL, ("pipe_zone not initialized")); } /* @@ -234,8 +236,6 @@ pipe(td, uap) struct pipe *rpipe, *wpipe; struct mtx *pmtx; int fd, error; - - KASSERT(pipe_zone != NULL, ("pipe_zone not initialized")); pmtx = malloc(sizeof(*pmtx), M_TEMP, M_WAITOK | M_ZERO); @@ -361,7 +361,6 @@ pipespace(cpipe, size) /* free old resources if we're resizing */ pipe_free_kmem(cpipe); - cpipe->pipe_buffer.object = object; cpipe->pipe_buffer.buffer = buffer; cpipe->pipe_buffer.size = size; cpipe->pipe_buffer.in = 0; @@ -388,8 +387,6 @@ pipe_create(cpipep) cpipe = *cpipep; - /* so pipespace()->pipe_free_kmem() doesn't follow junk pointer */ - cpipe->pipe_buffer.object = NULL; /* * protect so pipeclose() doesn't follow a junk pointer * if pipespace() fails. diff --git a/sys/sys/pipe.h b/sys/sys/pipe.h index d9ab09c..93103f6 100644 --- a/sys/sys/pipe.h +++ b/sys/sys/pipe.h @@ -74,7 +74,6 @@ struct pipebuf { u_int out; /* out pointer */ u_int size; /* size of buffer */ caddr_t buffer; /* kva of buffer */ - struct vm_object *object; /* VM object containing buffer */ }; /* |
