Source-Changes-HG archive

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

[src/trunk]: src/sys/ufs/lfs there's no need to treat VOP_WHITEOUT as dirop



details:   https://anonhg.NetBSD.org/src/rev/7eacd52e614c
branches:  trunk
changeset: 542481:7eacd52e614c
user:      yamt <yamt%NetBSD.org@localhost>
date:      Thu Jan 30 14:18:32 2003 +0000

description:
there's no need to treat VOP_WHITEOUT as dirop
because it modifies only one inode.

diffstat:

 sys/ufs/lfs/lfs_extern.h |   3 +--
 sys/ufs/lfs/lfs_vnops.c  |  26 +++-----------------------
 2 files changed, 4 insertions(+), 25 deletions(-)

diffs (71 lines):

diff -r 272c00e0e74a -r 7eacd52e614c sys/ufs/lfs/lfs_extern.h
--- a/sys/ufs/lfs/lfs_extern.h  Thu Jan 30 13:32:25 2003 +0000
+++ b/sys/ufs/lfs/lfs_extern.h  Thu Jan 30 14:18:32 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_extern.h,v 1.35 2003/01/24 21:55:27 fvdl Exp $     */
+/*     $NetBSD: lfs_extern.h,v 1.36 2003/01/30 14:18:32 yamt Exp $     */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -233,7 +233,6 @@
 int lfs_inactive (void *);
 int lfs_reclaim         (void *);
 int lfs_write   (void *);
-int lfs_whiteout (void *);
 int lfs_getpages (void *);
 int lfs_putpages (void *);
 
diff -r 272c00e0e74a -r 7eacd52e614c sys/ufs/lfs/lfs_vnops.c
--- a/sys/ufs/lfs/lfs_vnops.c   Thu Jan 30 13:32:25 2003 +0000
+++ b/sys/ufs/lfs/lfs_vnops.c   Thu Jan 30 14:18:32 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_vnops.c,v 1.81 2003/01/25 23:00:10 kleink Exp $    */
+/*     $NetBSD: lfs_vnops.c,v 1.82 2003/01/30 14:18:32 yamt Exp $      */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.81 2003/01/25 23:00:10 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.82 2003/01/30 14:18:32 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -106,7 +106,7 @@
        { &vop_default_desc, vn_default_error },
        { &vop_lookup_desc, ufs_lookup },               /* lookup */
        { &vop_create_desc, lfs_create },               /* create */
-       { &vop_whiteout_desc, lfs_whiteout },           /* whiteout */
+       { &vop_whiteout_desc, ufs_whiteout },           /* whiteout */
        { &vop_mknod_desc, lfs_mknod },                 /* mknod */
        { &vop_open_desc, ufs_open },                   /* open */
        { &vop_close_desc, lfs_close },                 /* close */
@@ -593,26 +593,6 @@
 }
 
 int
-lfs_whiteout(void *v)
-{
-       struct vop_whiteout_args /* {
-               struct vnode *a_dvp;
-               struct componentname *a_cnp;
-               int a_flags;
-       } */ *ap = v;
-       int error;
-
-       if ((error = SET_DIROP(ap->a_dvp)) != 0)
-               /* XXX no unlock here? */
-               return error;
-       MARK_VNODE(ap->a_dvp);
-       error = ufs_whiteout(ap);
-       UNMARK_VNODE(ap->a_dvp);
-       SET_ENDOP(VTOI(ap->a_dvp)->i_lfs,ap->a_dvp,"whiteout");
-       return (error);
-}
-
-int
 lfs_mkdir(void *v)
 {
        struct vop_mkdir_args   /* {



Home | Main Index | Thread Index | Old Index