[src/netbsd-2-0]: src/sys/miscfs/genfs Pull up revision 1.17 (requested by ya...

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

details:   https://anonhg.NetBSD.org/src/rev/a1b164a432a0
branches:  netbsd-2-0
changeset: 561480:a1b164a432a0
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jun 21 10:06:07 2004 +0000

description:
Pull up revision 1.17 (requested by yamt in ticket #512):
do a LAYERFS_REMOVED hack for vop_rename as well.

diffstat:

 sys/miscfs/genfs/layer_vnops.c |  40 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 37 insertions(+), 3 deletions(-)

diffs (68 lines):

diff -r a700839238c9 -r a1b164a432a0 sys/miscfs/genfs/layer_vnops.c
--- a/sys/miscfs/genfs/layer_vnops.c    Mon Jun 21 10:05:45 2004 +0000
+++ b/sys/miscfs/genfs/layer_vnops.c    Mon Jun 21 10:06:07 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: layer_vnops.c,v 1.14.2.1 2004/05/30 15:09:24 tron Exp $        */
+/*     $NetBSD: layer_vnops.c,v 1.14.2.2 2004/06/21 10:06:07 tron 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.14.2.1 2004/05/30 15:09:24 tron Exp $
+ *     $Id: layer_vnops.c,v 1.14.2.2 2004/06/21 10:06:07 tron 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.14.2.1 2004/05/30 15:09:24 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: layer_vnops.c,v 1.14.2.2 2004/06/21 10:06:07 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -783,6 +783,40 @@
 }
 
 int
+layer_rename(v)
+       void *v;
+{
+       struct vop_rename_args  /* {
+               struct vnode            *a_fdvp;
+               struct vnode            *a_fvp;
+               struct componentname    *a_fcnp;
+               struct vnode            *a_tdvp;
+               struct vnode            *a_tvp;
+               struct componentname    *a_tcnp;
+       } */ *ap = v;
+
+       int error;
+       struct vnode *fdvp = ap->a_fdvp;
+       struct vnode *tvp;
+
+       tvp = ap->a_tvp;
+       if (tvp) {
+               if (tvp->v_mount != fdvp->v_mount)
+                       tvp = NULL;
+               else
+                       vref(tvp);
+       }
+       error = LAYERFS_DO_BYPASS(fdvp, ap);
+       if (tvp) {
+               if (error == 0)
+                       VTOLAYER(tvp)->layer_flags |= LAYERFS_REMOVED;
+               vrele(tvp);
+       }
+
+       return (error);
+}
+
+int
 layer_reclaim(v)
        void *v;
 {