Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern Fix bug introduced in previous commuit: Do not vrel...



details:   https://anonhg.NetBSD.org/src/rev/698d97bbd4e6
branches:  trunk
changeset: 766663:698d97bbd4e6
user:      manu <manu%NetBSD.org@localhost>
date:      Wed Jun 29 08:01:14 2011 +0000

description:
Fix bug introduced in previous commuit: Do not vrele() a vnode we did not
obtained.

diffstat:

 sys/kern/vfs_xattr.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r d8a1e1036c08 -r 698d97bbd4e6 sys/kern/vfs_xattr.c
--- a/sys/kern/vfs_xattr.c      Wed Jun 29 06:34:31 2011 +0000
+++ b/sys/kern/vfs_xattr.c      Wed Jun 29 08:01:14 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_xattr.c,v 1.25 2011/06/28 07:50:03 manu Exp $      */
+/*     $NetBSD: vfs_xattr.c,v 1.26 2011/06/29 08:01:14 manu Exp $      */
 
 /*-
  * Copyright (c) 2005, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_xattr.c,v 1.25 2011/06/28 07:50:03 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_xattr.c,v 1.26 2011/06/29 08:01:14 manu Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -794,7 +794,7 @@
        error = namei_simple_user(SCARG(uap, path),
                                NSM_FOLLOW_NOEMULROOT, &vp);
        if (error)
-               goto out_rele;
+               goto out;
 
        namespace = xattr_native(attrname);
 
@@ -802,7 +802,6 @@
            attrname, SCARG(uap, value), SCARG(uap, size), l, 
            &attrlen, SCARG(uap, flags));
 
-out_rele:
        vrele(vp);
 out:
        *retval = (error == 0) ? 0 : -1;
@@ -833,7 +832,7 @@
        error = namei_simple_user(SCARG(uap, path),
                                NSM_NOFOLLOW_NOEMULROOT, &vp);
        if (error)
-               goto out_rele;
+               goto out;
 
        namespace = xattr_native(attrname);
 
@@ -841,7 +840,6 @@
            attrname, SCARG(uap, value), SCARG(uap, size), l,
            &attrlen, SCARG(uap, flags));
 
-out_rele:
        vrele(vp);
 out:
        *retval = (error == 0) ? 0 : -1;



Home | Main Index | Thread Index | Old Index