[src/trunk]: src/sys/kern Make sure to not overwrite error if it already is E...

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

details:   https://anonhg.NetBSD.org/src/rev/e2c46bbe0502
branches:  trunk
changeset: 767610:e2c46bbe0502
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Jul 24 09:40:10 2011 +0000

description:
Make sure to not overwrite error if it already is EEXISTS - hopefully
will fix > 100 failing fs tests in my last test run.

diffstat:

 sys/kern/vfs_syscalls.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 7854ed8cc067 -r e2c46bbe0502 sys/kern/vfs_syscalls.c
--- a/sys/kern/vfs_syscalls.c   Sun Jul 24 09:00:06 2011 +0000
+++ b/sys/kern/vfs_syscalls.c   Sun Jul 24 09:40:10 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_syscalls.c,v 1.431 2011/07/03 15:25:09 hannken Exp $       */
+/*     $NetBSD: vfs_syscalls.c,v 1.432 2011/07/24 09:40:10 martin Exp $        */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.431 2011/07/03 15:25:09 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.432 2011/07/24 09:40:10 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_fileassoc.h"
@@ -1683,7 +1683,8 @@
                        break;
                }
        }
-       if (optype == VOP_MKNOD_DESCOFFSET && vattr.va_rdev == VNOVAL)
+       if (error == 0 && optype == VOP_MKNOD_DESCOFFSET
+           && vattr.va_rdev == VNOVAL)
                error = EINVAL;
        if (!error) {
                switch (optype) {