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

- Delay the allocation of memory for the pipe mutex until we need it.

Browse Source 
This avoids the need to free said memory in various error cases along
   the way.
This commit is contained in:
Alan Cox 2003-11-06 05:58:26 +00:00
parent fc17df5264
commit 3b2c54e7bc
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/sys_pipe.c
View File

@ -222,13 +222,10 @@ pipe(td, uap)
struct mtx *pmtx;
int fd, error;
pmtx = malloc(sizeof(*pmtx), M_TEMP, M_WAITOK | M_ZERO);
rpipe = wpipe = NULL;
if (pipe_create(&rpipe) || pipe_create(&wpipe)) {
pipeclose(rpipe);
pipeclose(wpipe);
free(pmtx, M_TEMP);
return (ENFILE);
}
@ -239,7 +236,6 @@ pipe(td, uap)
if (error) {
pipeclose(rpipe);
pipeclose(wpipe);
free(pmtx, M_TEMP);
return (error);
}
/* An extra reference on `rf' has been held for us by falloc(). */
@ -269,7 +265,6 @@ pipe(td, uap)
fdrop(rf, td);
/* rpipe has been closed by fdrop(). */
pipeclose(wpipe);
free(pmtx, M_TEMP);
return (error);
}
/* An extra reference on `wf' has been held for us by falloc(). */
@ -293,6 +288,7 @@ pipe(td, uap)
mac_init_pipe(rpipe);
mac_create_pipe(td->td_ucred, rpipe);
#endif
pmtx = malloc(sizeof(*pmtx), M_TEMP, M_WAITOK | M_ZERO);
mtx_init(pmtx, "pipe mutex", NULL, MTX_DEF | MTX_RECURSE);
rpipe->pipe_mtxp = wpipe->pipe_mtxp = pmtx;
fdrop(rf, td);