Wed Feb 18 06:35:58 2015 UTC ()

Pull up following revision(s) (requested by martin in ticket #523):
	sys/kern/vfs_syscalls.c: revision 1.493
A syscall like posix_fallocate() that is not supposed to set errno in
userland needs to always return 0 and store the error code *retval.


(snj)

diff -r1.490.2.1 -r1.490.2.2 src/sys/kern/vfs_syscalls.c

--- src/sys/kern/vfs_syscalls.c 2014/12/01 09:54:50	1.490.2.1
+++ src/sys/kern/vfs_syscalls.c 2015/02/18 06:35:58	1.490.2.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_syscalls.c,v 1.490.2.1 2014/12/01 09:54:50 martin Exp $	*/
+/*	$NetBSD: vfs_syscalls.c,v 1.490.2.2 2015/02/18 06:35:58 snj Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -60,27 +60,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)vfs_syscalls.c	8.42 (Berkeley) 7/31/95
  */
 /*
  * Virtual File System System Calls
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.490.2.1 2014/12/01 09:54:50 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.490.2.2 2015/02/18 06:35:58 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_fileassoc.h"
 #include "veriexec.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/fcntl.h>
 @@ -4706,50 +4706,53 @@ sys_posix_fallocate(struct lwp *l, const
 		syscallarg(off_t) len;
 	} */
 	int fd;
 	off_t pos, len;
 	struct file *fp;
 	struct vnode *vp;
 	int error;
 	fd = SCARG(uap, fd);
 	pos = SCARG(uap, pos);
 	len = SCARG(uap, len);
 	if (pos < 0 || len < 0 || len > OFF_T_MAX - pos) {
-		return EINVAL;
+		*retval = EINVAL;
 		return 0;
+	}
 	error = fd_getvnode(fd, &fp);
 	if (error) {
-		return error;
+		*retval = error;
 		return 0;
+	}
 	if ((fp->f_flag & FWRITE) == 0) {
 		error = EBADF;
 		goto fail;
+	}
 	vp = fp->f_data;
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	if (vp->v_type == VDIR) {
 		error = EISDIR;
 	} else {
 		error = VOP_FALLOCATE(vp, pos, len);
+	}
 	VOP_UNLOCK(vp);
 fail:
 	fd_putfile(fd);
-	return error;
+	*retval = error;
 	return 0;
+}
 /*
  * Deallocate backing store for a file, creating a hole. Also used for
  * invoking TRIM on disks.
  */
 /* ARGSUSED */
 int
 sys_fdiscard(struct lwp *l, const struct sys_fdiscard_args *uap,
 		register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;