[src/nathanw_sa]: src/sys/ufs/lfs Sync with HEAD.

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

details:   https://anonhg.NetBSD.org/src/rev/f1a3995bbfa5
branches:  nathanw_sa
changeset: 506711:f1a3995bbfa5
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Jan 08 17:17:51 2003 +0000

description:
Sync with HEAD.

diffstat:

 sys/ufs/lfs/lfs_vnops.c |  26 ++------------------------
 1 files changed, 2 insertions(+), 24 deletions(-)

diffs (54 lines):

diff -r 32f7a1ad4cb4 -r f1a3995bbfa5 sys/ufs/lfs/lfs_vnops.c
--- a/sys/ufs/lfs/lfs_vnops.c   Wed Jan 08 16:58:22 2003 +0000
+++ b/sys/ufs/lfs/lfs_vnops.c   Wed Jan 08 17:17:51 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_vnops.c,v 1.50.2.14 2003/01/08 17:04:02 thorpej Exp $      */
+/*     $NetBSD: lfs_vnops.c,v 1.50.2.15 2003/01/08 17:17:51 thorpej 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.50.2.14 2003/01/08 17:04:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.50.2.15 2003/01/08 17:17:51 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -663,17 +663,6 @@
        UNMARK_VNODE(dvp);
        UNMARK_VNODE(vp);
 
-       /*
-        * If ufs_remove failed, vp doesn't need to be VDIROP any more.
-        * If it succeeded, we can go ahead and wipe out vp, since
-        * its loss won't appear on disk until checkpoint, and by then
-        * dvp will have been written, completing the dirop.
-        */
-       --lfs_dirvcount;
-       vp->v_flag &= ~VDIROP;
-       wakeup(&lfs_dirvcount);
-       vrele(vp);
-
        SET_ENDOP2(VTOI(dvp)->i_lfs, dvp, vp, "remove");
        return (error);
 }
@@ -702,17 +691,6 @@
        UNMARK_VNODE(ap->a_dvp);
        UNMARK_VNODE(ap->a_vp);
 
-       /*
-        * If ufs_rmdir failed, vp doesn't need to be VDIROP any more.
-        * If it succeeded, we can go ahead and wipe out vp, since
-        * its loss won't appear on disk until checkpoint, and by then
-        * dvp will have been written, completing the dirop.
-        */
-       --lfs_dirvcount;
-       ap->a_vp->v_flag &= ~VDIROP;
-       wakeup(&lfs_dirvcount);
-       vrele(ap->a_vp);
-
        SET_ENDOP2(VTOI(ap->a_dvp)->i_lfs, ap->a_dvp, ap->a_vp, "rmdir");
        return (error);
 }