From owner-svn-src-head@freebsd.org  Sat Oct  3 22:27:15 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7E21FA0F0E8;
 Sat,  3 Oct 2015 22:27:15 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6EBF11588;
 Sat,  3 Oct 2015 22:27:15 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t93MRF3G047421;
 Sat, 3 Oct 2015 22:27:15 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t93MRFGk047419;
 Sat, 3 Oct 2015 22:27:15 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201510032227.t93MRFGk047419@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Sat, 3 Oct 2015 22:27:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r288640 - in head: lib/libc/sys sys/kern
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.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Oct 2015 22:27:15 -0000

Author: markj
Date: Sat Oct  3 22:27:14 2015
New Revision: 288640
URL: https://svnweb.freebsd.org/changeset/base/288640

Log:
  Revert r288628 and instead fix a discrepancy between the posix_fadvise(2)
  man page and POSIX: posix_fadvise(2) returns an error number on failure.
  
  Reported by:	jilles
  MFC after:	1 week

Modified:
  head/lib/libc/sys/posix_fadvise.2
  head/sys/kern/vfs_syscalls.c

Modified: head/lib/libc/sys/posix_fadvise.2
==============================================================================
--- head/lib/libc/sys/posix_fadvise.2	Sat Oct  3 22:26:59 2015	(r288639)
+++ head/lib/libc/sys/posix_fadvise.2	Sat Oct  3 22:27:14 2015	(r288640)
@@ -28,7 +28,7 @@
 .\"	@(#)madvise.2	8.1 (Berkeley) 6/9/93
 .\" $FreeBSD$
 .\"
-.Dd January 30, 2014
+.Dd October 3, 2015
 .Dt POSIX_FADVISE 2
 .Os
 .Sh NAME
@@ -89,11 +89,13 @@ read or written.
 Future access to this data may require a read operation.
 .El
 .Sh RETURN VALUES
-.Rv -std posix_fadvise
-.Sh ERRORS
-The
+If successful,
 .Fn posix_fadvise
-system call returns zero on success, and an error on failure:
+returns zero.
+It returns an error on failure, without setting
+.Va errno .
+.Sh ERRORS
+Possible failure conditions:
 .Bl -tag -width Er
 .It Bq Er EBADF
 The

Modified: head/sys/kern/vfs_syscalls.c
==============================================================================
--- head/sys/kern/vfs_syscalls.c	Sat Oct  3 22:26:59 2015	(r288639)
+++ head/sys/kern/vfs_syscalls.c	Sat Oct  3 22:27:14 2015	(r288640)
@@ -4663,6 +4663,7 @@ int
 sys_posix_fadvise(struct thread *td, struct posix_fadvise_args *uap)
 {
 
-	return (kern_posix_fadvise(td, uap->fd, uap->offset, uap->len,
-	    uap->advice));
+	td->td_retval[0] = kern_posix_fadvise(td, uap->fd, uap->offset,
+	    uap->len, uap->advice);
+	return (0);
 }