Module Name: src
Committed By: nat
Date: Thu May 11 22:38:56 UTC 2017
Modified Files:
src/sys/kern: kern_descrip.c
Log Message:
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.229 -r1.230 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.229 src/sys/kern/kern_descrip.c:1.230
--- src/sys/kern/kern_descrip.c:1.229 Mon Aug 3 04:55:15 2015
+++ src/sys/kern/kern_descrip.c Thu May 11 22:38:56 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_descrip.c,v 1.229 2015/08/03 04:55:15 christos Exp $ */
+/* $NetBSD: kern_descrip.c,v 1.230 2017/05/11 22:38:56 nat 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.229 2015/08/03 04:55:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.230 2017/05/11 22:38:56 nat 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);
