[src/trunk]: src/sys/miscfs umap_lookup/layer_lookup: NULL out *ap->a_vpp aft...

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

details:   https://anonhg.NetBSD.org/src/rev/fb9c683b4c7f
branches:  trunk
changeset: 567378:fb9c683b4c7f
user:      yamt <yamt%NetBSD.org@localhost>
date:      Fri Jun 11 12:34:13 2004 +0000

description:
umap_lookup/layer_lookup: NULL out *ap->a_vpp after calling
underlying filesystem because some caller including lookup()
assume that *vpp is NULL on error.

diffstat:

 sys/miscfs/genfs/layer_vnops.c |  7 ++++---
 sys/miscfs/umapfs/umap_vnops.c |  5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (61 lines):

diff -r c3af75c9cb04 -r fb9c683b4c7f sys/miscfs/genfs/layer_vnops.c
--- a/sys/miscfs/genfs/layer_vnops.c    Fri Jun 11 12:26:31 2004 +0000
+++ b/sys/miscfs/genfs/layer_vnops.c    Fri Jun 11 12:34:13 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: layer_vnops.c,v 1.17 2004/06/07 17:36:38 yamt Exp $    */
+/*     $NetBSD: layer_vnops.c,v 1.18 2004/06/11 12:34:13 yamt Exp $    */
 
 /*
  * Copyright (c) 1999 National Aeronautics & Space Administration
@@ -67,7 +67,7 @@
  *
  * Ancestors:
  *     @(#)lofs_vnops.c        1.2 (Berkeley) 6/18/92
- *     $Id: layer_vnops.c,v 1.17 2004/06/07 17:36:38 yamt Exp $
+ *     $Id: layer_vnops.c,v 1.18 2004/06/11 12:34:13 yamt Exp $
  *     ...and...
  *     @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
  */
@@ -232,7 +232,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: layer_vnops.c,v 1.17 2004/06/07 17:36:38 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: layer_vnops.c,v 1.18 2004/06/11 12:34:13 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -434,6 +434,7 @@
        ap->a_dvp = ldvp;
        error = VCALL(ldvp, ap->a_desc->vdesc_offset, ap);
        vp = *ap->a_vpp;
+       *ap->a_vpp = NULL;
 
        if (error == EJUSTRETURN && (flags & ISLASTCN) &&
            (dvp->v_mount->mnt_flag & MNT_RDONLY) &&
diff -r c3af75c9cb04 -r fb9c683b4c7f sys/miscfs/umapfs/umap_vnops.c
--- a/sys/miscfs/umapfs/umap_vnops.c    Fri Jun 11 12:26:31 2004 +0000
+++ b/sys/miscfs/umapfs/umap_vnops.c    Fri Jun 11 12:34:13 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: umap_vnops.c,v 1.27 2004/06/07 17:36:38 yamt Exp $     */
+/*     $NetBSD: umap_vnops.c,v 1.28 2004/06/11 12:34:13 yamt Exp $     */
 
 /*
  * Copyright (c) 1992, 1993
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umap_vnops.c,v 1.27 2004/06/07 17:36:38 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umap_vnops.c,v 1.28 2004/06/11 12:34:13 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -363,6 +363,7 @@
        ap->a_dvp = ldvp;
        error = VCALL(ldvp, ap->a_desc->vdesc_offset, ap);
        vp = *ap->a_vpp;
+       *ap->a_vpp = NULL;
 
        if (error == EJUSTRETURN && (cnf & ISLASTCN) &&
            (dvp->v_mount->mnt_flag & MNT_RDONLY) &&