From owner-svn-src-head@FreeBSD.ORG Sun Mar 31 17:42:55 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2A58BA43; Sun, 31 Mar 2013 17:42:55 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0424985A; Sun, 31 Mar 2013 17:42:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2VHgsUW030573; Sun, 31 Mar 2013 17:42:54 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2VHgsCU030570; Sun, 31 Mar 2013 17:42:54 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201303311742.r2VHgsCU030570@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 31 Mar 2013 17:42:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r248951 - in head/sys: compat/linux kern sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Mar 2013 17:42:55 -0000 Author: jilles Date: Sun Mar 31 17:42:54 2013 New Revision: 248951 URL: http://svnweb.freebsd.org/changeset/base/248951 Log: Rename do_pipe() to kern_pipe2() and declare it properly. Modified: head/sys/compat/linux/linux_file.c head/sys/kern/sys_pipe.c head/sys/sys/syscallsubr.h Modified: head/sys/compat/linux/linux_file.c ============================================================================== --- head/sys/compat/linux/linux_file.c Sun Mar 31 14:10:49 2013 (r248950) +++ head/sys/compat/linux/linux_file.c Sun Mar 31 17:42:54 2013 (r248951) @@ -70,9 +70,6 @@ __FBSDID("$FreeBSD$"); #include #include -/* 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 lin 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 li 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); Modified: head/sys/kern/sys_pipe.c ============================================================================== --- head/sys/kern/sys_pipe.c Sun Mar 31 14:10:49 2013 (r248950) +++ head/sys/kern/sys_pipe.c Sun Mar 31 17:42:54 2013 (r248951) @@ -129,9 +129,6 @@ __FBSDID("$FreeBSD$"); #include #include -/* 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; Modified: head/sys/sys/syscallsubr.h ============================================================================== --- head/sys/sys/syscallsubr.h Sun Mar 31 14:10:49 2013 (r248950) +++ head/sys/sys/syscallsubr.h Sun Mar 31 17:42:54 2013 (r248951) @@ -156,6 +156,7 @@ int kern_openat(struct thread *td, int f 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,