[src/trunk]: src/sys/kern This is weird; 'abort' already does all this, so si...

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

details:   https://anonhg.NetBSD.org/src/rev/1b5c6d486796
branches:  trunk
changeset: 330236:1b5c6d486796
user:      maxv <maxv%NetBSD.org@localhost>
date:      Mon Jun 30 17:51:31 2014 +0000

description:
This is weird; 'abort' already does all this, so simply use goto abort.

diffstat:

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

diffs (37 lines):

diff -r d4bcd166726a -r 1b5c6d486796 sys/kern/vfs_syscalls.c
--- a/sys/kern/vfs_syscalls.c   Mon Jun 30 17:31:15 2014 +0000
+++ b/sys/kern/vfs_syscalls.c   Mon Jun 30 17:51:31 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_syscalls.c,v 1.486 2014/06/28 22:27:50 dholland Exp $      */
+/*     $NetBSD: vfs_syscalls.c,v 1.487 2014/06/30 17:51:31 maxv 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.486 2014/06/28 22:27:50 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.487 2014/06/30 17:51:31 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_fileassoc.h"
@@ -2696,17 +2696,10 @@
                goto abort;
        }
 
-
 #if NVERIEXEC > 0
        /* Handle remove requests for veriexec entries. */
        if ((error = veriexec_removechk(curlwp, nd.ni_vp, pathstring)) != 0) {
-               VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
-               if (nd.ni_dvp == vp)
-                       vrele(nd.ni_dvp);
-               else
-                       vput(nd.ni_dvp);
-               vput(vp);
-               goto out;
+               goto abort;
        }
 #endif /* NVERIEXEC > 0 */