[src/trunk]: src/external/cddl/osnet/sys fix kobj_open_file_vnode()

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3155e104a031
branches:  trunk
changeset: 761228:3155e104a031
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Jan 21 12:24:24 2011 +0000

description:
fix kobj_open_file_vnode()

patch from haad

diffstat:

 external/cddl/osnet/sys/kern/kobj.c |  6 +++---
 external/cddl/osnet/sys/sys/vnode.h |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r e06d34b0837a -r 3155e104a031 external/cddl/osnet/sys/kern/kobj.c
--- a/external/cddl/osnet/sys/kern/kobj.c       Fri Jan 21 12:23:29 2011 +0000
+++ b/external/cddl/osnet/sys/kern/kobj.c       Fri Jan 21 12:24:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kobj.c,v 1.1 2009/08/07 20:57:57 haad Exp $    */
+/*     $NetBSD: kobj.c,v 1.2 2011/01/21 12:24:24 pooka Exp $   */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kobj.c,v 1.4 2007/05/31 11:51:49 kib Exp $"); */
-__KERNEL_RCSID(0, "$NetBSD: kobj.c,v 1.1 2009/08/07 20:57:57 haad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobj.c,v 1.2 2011/01/21 12:24:24 pooka Exp $");
 
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -97,7 +97,7 @@
 {
        vnode_t *vp;
 
-       if (vn_open(file, UIO_SYSSPACE, 0, 0, &vp, CRCREAT, 0) != 0) {
+       if (vn_open(file, UIO_SYSSPACE, FCREAT, 0, &vp, CRCREAT, 0) != 0) {
                return NULL;
        }
        return vp;
diff -r e06d34b0837a -r 3155e104a031 external/cddl/osnet/sys/sys/vnode.h
--- a/external/cddl/osnet/sys/sys/vnode.h       Fri Jan 21 12:23:29 2011 +0000
+++ b/external/cddl/osnet/sys/sys/vnode.h       Fri Jan 21 12:24:24 2011 +0000
@@ -1,5 +1,5 @@
 
-/*     $NetBSD: vnode.h,v 1.7 2010/12/14 01:21:02 haad Exp $   */
+/*     $NetBSD: vnode.h,v 1.8 2011/01/21 12:24:24 pooka Exp $  */
 
 /*
  * CDDL HEADER START
@@ -536,7 +536,7 @@
        int error;
 
        ASSERT(seg == UIO_SYSSPACE);
-       ASSERT(filemode == (FWRITE | FCREAT | FTRUNC | FOFFMAX));
+       ASSERT((filemode & (FWRITE | FCREAT | FTRUNC | FOFFMAX)) != 0);
        ASSERT(crwhy == CRCREAT);
        ASSERT(umask == 0);