Module Name: src
Committed By: rmind
Date: Mon May 23 22:02:26 UTC 2011
Modified Files:
src/sys/ufs/ufs: ufs_wapbl.c
Log Message:
ufs_wapbl_verify_inodes: update to reality (if somebody decides to use this).
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/ufs/ufs/ufs_wapbl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ufs/ufs_wapbl.c
diff -u src/sys/ufs/ufs/ufs_wapbl.c:1.12 src/sys/ufs/ufs/ufs_wapbl.c:1.13
--- src/sys/ufs/ufs/ufs_wapbl.c:1.12 Sun Jan 2 05:09:32 2011
+++ src/sys/ufs/ufs/ufs_wapbl.c Mon May 23 22:02:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_wapbl.c,v 1.12 2011/01/02 05:09:32 dholland Exp $ */
+/* $NetBSD: ufs_wapbl.c,v 1.13 2011/05/23 22:02:26 rmind Exp $ */
/*-
* Copyright (c) 2003,2006,2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_wapbl.c,v 1.12 2011/01/02 05:09:32 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_wapbl.c,v 1.13 2011/05/23 22:02:26 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -699,8 +699,9 @@
{
struct vnode *vp, *nvp;
struct inode *ip;
+ struct buf *bp, *nbp;
- simple_lock(&mntvnode_slock);
+ mutex_enter(&mntvnode_lock);
loop:
TAILQ_FOREACH_REVERSE(vp, &mp->mnt_vnodelist, vnodelst, v_mntvnodes) {
/*
@@ -709,11 +710,11 @@
*/
if (vp->v_mount != mp)
goto loop;
- simple_lock(&vp->v_interlock);
+ mutex_enter(&vp->v_interlock);
nvp = TAILQ_NEXT(vp, v_mntvnodes);
ip = VTOI(vp);
if (vp->v_type == VNON) {
- simple_unlock(&vp->v_interlock);
+ mutex_exit(&vp->v_interlock);
continue;
}
/* verify that update has been called on all inodes */
@@ -721,55 +722,36 @@
panic("wapbl_verify: mp %p: dirty vnode %p (inode %p): 0x%x\n",
mp, vp, ip, ip->i_flag);
}
+ mutex_exit(&mntvnode_lock);
- simple_unlock(&mntvnode_slock);
- {
- int s;
- struct buf *bp;
- struct buf *nbp;
- s = splbio();
- for (bp = LIST_FIRST(&vp->v_dirtyblkhd); bp; bp = nbp) {
- nbp = LIST_NEXT(bp, b_vnbufs);
- simple_lock(&bp->b_interlock);
- if ((bp->b_flags & B_BUSY)) {
- simple_unlock(&bp->b_interlock);
- continue;
- }
- if ((bp->b_flags & B_DELWRI) == 0)
- panic("wapbl_verify: not dirty, bp %p", bp);
- if ((bp->b_flags & B_LOCKED) == 0)
- panic("wapbl_verify: not locked, bp %p", bp);
- simple_unlock(&bp->b_interlock);
+ mutex_enter(&bufcache_lock);
+ for (bp = LIST_FIRST(&vp->v_dirtyblkhd); bp; bp = nbp) {
+ nbp = LIST_NEXT(bp, b_vnbufs);
+ if ((bp->b_cflags & BC_BUSY)) {
+ continue;
}
- splx(s);
+ KASSERT((bp->b_oflags & BO_DELWRI) != 0);
+ KASSERT((bp->b_flags & B_LOCKED) != 0);
}
- simple_unlock(&vp->v_interlock);
- simple_lock(&mntvnode_slock);
+ mutex_exit(&bufcache_lock);
+ mutex_exit(&vp->v_interlock);
+
+ mutex_enter(&mntvnode_lock);
}
- simple_unlock(&mntvnode_slock);
+ mutex_exit(&mntvnode_lock);
vp = VFSTOUFS(mp)->um_devvp;
- simple_lock(&vp->v_interlock);
- {
- int s;
- struct buf *bp;
- struct buf *nbp;
- s = splbio();
- for (bp = LIST_FIRST(&vp->v_dirtyblkhd); bp; bp = nbp) {
- nbp = LIST_NEXT(bp, b_vnbufs);
- simple_lock(&bp->b_interlock);
- if ((bp->b_flags & B_BUSY)) {
- simple_unlock(&bp->b_interlock);
- continue;
- }
- if ((bp->b_flags & B_DELWRI) == 0)
- panic("wapbl_verify: devvp not dirty, bp %p", bp);
- if ((bp->b_flags & B_LOCKED) == 0)
- panic("wapbl_verify: devvp not locked, bp %p", bp);
- simple_unlock(&bp->b_interlock);
+ mutex_enter(&vp->v_interlock);
+ mutex_enter(&bufcache_lock);
+ for (bp = LIST_FIRST(&vp->v_dirtyblkhd); bp; bp = nbp) {
+ nbp = LIST_NEXT(bp, b_vnbufs);
+ if ((bp->b_cflags & BC_BUSY)) {
+ continue;
}
- splx(s);
+ KASSERT((bp->b_oflags & BO_DELWRI) != 0);
+ KASSERT((bp->b_flags & B_LOCKED) != 0);
}
- simple_unlock(&vp->v_interlock);
+ mutex_exit(&bufcache_lock);
+ mutex_exit(&vp->v_interlock);
}
#endif /* WAPBL_DEBUG_INODES */
