diff --git a/sys/ufs/lfs/lfs_alloc.c b/sys/ufs/lfs/lfs_alloc.c index 21ab31f24b99..1ed7c4b1b202 100644 --- a/sys/ufs/lfs/lfs_alloc.c +++ b/sys/ufs/lfs/lfs_alloc.c @@ -1,4 +1,4 @@ -/* $NetBSD: lfs_alloc.c,v 1.57 2002/11/24 08:43:26 yamt Exp $ */ +/* $NetBSD: lfs_alloc.c,v 1.58 2003/01/08 15:40:04 yamt Exp $ */ /*- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: lfs_alloc.c,v 1.57 2002/11/24 08:43:26 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lfs_alloc.c,v 1.58 2003/01/08 15:40:04 yamt Exp $"); #if defined(_KERNEL_OPT) #include "opt_quota.h" @@ -546,10 +546,7 @@ lfs_vfree(void *v) wakeup(&lfs_dirvcount); lfs_vunref(vp); } - if (ip->i_flag & IN_ADIROP) { - --fs->lfs_nadirop; - ip->i_flag &= ~IN_ADIROP; - } + lfs_unmark_vnode(vp); LFS_CLR_UINO(ip, IN_ACCESSED|IN_CLEANING|IN_MODIFIED); ip->i_flag &= ~IN_ALLMOD; diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c index 757bcf12b5cb..f4f63ec7a24c 100644 --- a/sys/ufs/lfs/lfs_vnops.c +++ b/sys/ufs/lfs/lfs_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: lfs_vnops.c,v 1.75 2002/12/29 07:05:55 yamt Exp $ */ +/* $NetBSD: lfs_vnops.c,v 1.76 2003/01/08 15:40:05 yamt Exp $ */ /*- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.75 2002/12/29 07:05:55 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.76 2003/01/08 15:40:05 yamt Exp $"); #include #include @@ -337,11 +337,9 @@ lfs_inactive(void *v) struct vnode *a_vp; struct proc *a_p; } */ *ap = v; - struct inode *ip = VTOI(ap->a_vp); - if (ip->i_flag & IN_ADIROP) - --ip->i_lfs->lfs_nadirop; - ip->i_flag &= ~IN_ADIROP; + lfs_unmark_vnode(ap->a_vp); + return ufs_inactive(v); }