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

Rename do_pipe() to kern_pipe2() and declare it properly.

Browse Source
This commit is contained in:
jilles 2013-03-31 17:42:54 +00:00
parent 1f73a954db
commit 9d8a3c5c3b
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/compat/linux/linux_file.c
View File

@ -70,9 +70,6 @@ __FBSDID("$FreeBSD$");
#include <compat/linux/linux_util.h>
#include <compat/linux/linux_file.h>
/* XXX */
int do_pipe(struct thread *td, int fildes[2], int flags);
int
linux_creat(struct thread *td, struct linux_creat_args *args)
{
@ -1584,7 +1581,7 @@ linux_pipe(struct thread *td, struct linux_pipe_args *args)
printf(ARGS(pipe, "*"));
#endif
error = do_pipe(td, fildes, 0);
error = kern_pipe2(td, fildes, 0);
if (error)
return (error);
@ -1611,7 +1608,7 @@ linux_pipe2(struct thread *td, struct linux_pipe2_args *args)
flags |= O_NONBLOCK;
if ((args->flags & LINUX_O_CLOEXEC) != 0)
flags |= O_CLOEXEC;
error = do_pipe(td, fildes, flags);
error = kern_pipe2(td, fildes, flags);
if (error)
return (error);

7
sys/kern/sys_pipe.c
View File

@ -129,9 +129,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_page.h>
#include <vm/uma.h>
/* XXX */
int do_pipe(struct thread *td, int fildes[2], int flags);
/*
* Use this define if you want to disable *fancy* VM things. Expect an
* approx 30% decrease in transfer rate. This could be useful for
@ -408,11 +405,11 @@ int
kern_pipe(struct thread *td, int fildes[2])
{
return (do_pipe(td, fildes, 0));
return (kern_pipe2(td, fildes, 0));
}
int
do_pipe(struct thread *td, int fildes[2], int flags)
kern_pipe2(struct thread *td, int fildes[2], int flags)
{
struct filedesc *fdp;
struct file *rf, *wf;

1
sys/sys/syscallsubr.h
View File

@ -156,6 +156,7 @@ int kern_openat(struct thread *td, int fd, char *path,
int kern_pathconf(struct thread *td, char *path, enum uio_seg pathseg,
int name, u_long flags);
int kern_pipe(struct thread *td, int fildes[2]);
int kern_pipe2(struct thread *td, int fildes[2], int flags);
int kern_posix_fadvise(struct thread *td, int fd, off_t offset, off_t len,
int advice);
int kern_posix_fallocate(struct thread *td, int fd, off_t offset,