d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Giant is no longer required by pipe_destroy_write_buffer(). Reduce

Browse Source 
unnecessary white space from pipe_destroy_write_buffer().
This commit is contained in:
alc 2003-09-06 21:02:10 +00:00
parent 1abfd7c900
commit 0c9dc7eaa4
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/kern/sys_pipe.c
View File

@ -743,9 +743,7 @@ pipe_destroy_write_buffer(wpipe)
{
int i;
GIANT_REQUIRED;
PIPE_LOCK_ASSERT(wpipe, MA_NOTOWNED);
if (wpipe->pipe_map.kva) {
pmap_qremove(wpipe->pipe_map.kva, wpipe->pipe_map.npages);
@ -754,7 +752,7 @@ pipe_destroy_write_buffer(wpipe)
vm_offset_t kva = wpipe->pipe_map.kva;
wpipe->pipe_map.kva = 0;
kmem_free(kernel_map, kva,
wpipe->pipe_buffer.size + PAGE_SIZE);
wpipe->pipe_buffer.size + PAGE_SIZE);
atomic_subtract_int(&amountpipekvawired,
wpipe->pipe_buffer.size + PAGE_SIZE);
}
@ -788,11 +786,11 @@ pipe_clone_write_buffer(wpipe)
wpipe->pipe_buffer.cnt = size;
wpipe->pipe_state &= ~PIPE_DIRECTW;
PIPE_GET_GIANT(wpipe);
PIPE_UNLOCK(wpipe);
bcopy((caddr_t) wpipe->pipe_map.kva + pos,
wpipe->pipe_buffer.buffer, size);
pipe_destroy_write_buffer(wpipe);
PIPE_DROP_GIANT(wpipe);
PIPE_LOCK(wpipe);
}
/*
@ -861,9 +859,9 @@ retry:
while (!error && (wpipe->pipe_state & PIPE_DIRECTW)) {
if (wpipe->pipe_state & PIPE_EOF) {
pipelock(wpipe, 0);
PIPE_GET_GIANT(wpipe);
PIPE_UNLOCK(wpipe);
pipe_destroy_write_buffer(wpipe);
PIPE_DROP_GIANT(wpipe);
PIPE_LOCK(wpipe);
pipeselwakeup(wpipe);
pipeunlock(wpipe);
error = EPIPE;
@ -886,9 +884,9 @@ retry:
*/
pipe_clone_write_buffer(wpipe);
} else {
PIPE_GET_GIANT(wpipe);
PIPE_UNLOCK(wpipe);
pipe_destroy_write_buffer(wpipe);
PIPE_DROP_GIANT(wpipe);
PIPE_LOCK(wpipe);
}
pipeunlock(wpipe);
return (error);