From d289dc7b7337acd25559a639d42c37c8d0e46bf0 Mon Sep 17 00:00:00 2001
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 31 Mar 2013 17:42:54 +0000
Subject: [PATCH] Rename do_pipe() to kern_pipe2() and declare it properly.

---
 sys/compat/linux/linux_file.c | 7 ++-----
 sys/kern/sys_pipe.c           | 7 ++-----
 sys/sys/syscallsubr.h         | 1 +
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index 7e4ac380825e..49c3fdf14d30 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -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);
 
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 5d0c4344f0ef..90c3022c1fd8 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -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;
diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h
index 75feec7026a4..fa0d35185788 100644
--- a/sys/sys/syscallsubr.h
+++ b/sys/sys/syscallsubr.h
@@ -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,