Module Name: src
Committed By: snj
Date: Sat Jun 3 16:57:17 UTC 2017
Modified Files:
src/sys/kern [netbsd-7-1]: kern_descrip.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1425):
sys/kern/kern_descrip.c: revision 1.230
Explicitly set the flags instead of masking set values in.
This fixes FNONBLOCK weirdness seen in audio.c
OK christos@ and martin@.
To generate a diff of this commit:
cvs rdiff -u -r1.225.2.1 -r1.225.2.1.6.1 src/sys/kern/kern_descrip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_descrip.c
diff -u src/sys/kern/kern_descrip.c:1.225.2.1 src/sys/kern/kern_descrip.c:1.225.2.1.6.1
--- src/sys/kern/kern_descrip.c:1.225.2.1 Tue Aug 4 17:24:59 2015
+++ src/sys/kern/kern_descrip.c Sat Jun 3 16:57:16 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_descrip.c,v 1.225.2.1 2015/08/04 17:24:59 snj Exp $ */
+/* $NetBSD: kern_descrip.c,v 1.225.2.1.6.1 2017/06/03 16:57:16 snj Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.225.2.1 2015/08/04 17:24:59 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.225.2.1.6.1 2017/06/03 16:57:16 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1864,7 +1864,7 @@ fd_clone(file_t *fp, unsigned fd, int fl
fdfile_t *ff;
filedesc_t *fdp;
- fp->f_flag |= flag & FMASK;
+ fp->f_flag = flag & FMASK;
fdp = curproc->p_fd;
ff = fdp->fd_dt->dt_ff[fd];
KASSERT(ff != NULL);
