Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

for lfs_remove/lfs_rmdir, keep removed vnodes marked VDIROP.

Browse Source 
(backout parts of rev.1.40)
otherwise, directory structures can be corrupted because checkpoints can
occur via eg. lfs_vflush before parent directory is written.
This commit is contained in:
yamt 2003-01-08 17:14:58 +00:00
parent 9f4eb04ccb
commit 99d625b53c
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/ufs/lfs/lfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_vnops.c,v 1.78 2003/01/08 15:43:29 yamt Exp $ */
/* $NetBSD: lfs_vnops.c,v 1.79 2003/01/08 17:14:58 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.78 2003/01/08 15:43:29 yamt Exp $");
__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.79 2003/01/08 17:14:58 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -662,17 +662,6 @@ lfs_remove(void *v)
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);
}
@ -701,17 +690,6 @@ lfs_rmdir(void *v)
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);
}