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

- raise spl to bio in lfs_countlocked() rather than having callers to do so.

Browse Source 
- buffer cache MP locks.
- assert B_CALL buffers are not on the free queue.
This commit is contained in:
yamt 2003-09-07 11:53:57 +00:00
parent 4a78faea0f
commit d20e923a9c
2 changed files with 10 additions and 8 deletions
sys/ufs/lfs
lfs.hlfs_bio.c

5
sys/ufs/lfs/lfs.h

@ -1,4 +1,4 @@
/* $NetBSD: lfs.h,v 1.69 2003/08/07 16:34:33 agc Exp $ */
/* $NetBSD: lfs.h,v 1.70 2003/09/07 11:53:57 yamt Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@ -202,10 +202,7 @@ typedef struct lfs_res_blk {
# ifdef DEBUG_LOCKED_LIST
# define LFS_DEBUG_COUNTLOCKED(m) do { \
int _s; \
_s = splbio(); \
lfs_countlocked(&locked_queue_count, &locked_queue_bytes, (m)); \
splx(_s); \
wakeup(&locked_queue_count); \
} while (0)
# else

13
sys/ufs/lfs/lfs_bio.c

@ -1,4 +1,4 @@
/* $NetBSD: lfs_bio.c,v 1.72 2003/08/07 16:34:35 agc Exp $ */
/* $NetBSD: lfs_bio.c,v 1.73 2003/09/07 11:53:58 yamt Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.72 2003/08/07 16:34:35 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.73 2003/09/07 11:53:58 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -723,6 +723,7 @@ lfs_freebuf(struct lfs *fs, struct buf *bp)
#define BQ_EMPTY 3 /* buffer headers with no memory */
extern TAILQ_HEAD(bqueues, buf) bufqueues[BQUEUES];
extern struct simplelock bqueue_slock;
/*
* Return a count of buffers on the "locked" queue.
@ -734,10 +735,12 @@ lfs_countlocked(int *count, long *bytes, char *msg)
struct buf *bp;
int n = 0;
long int size = 0L;
int s;
s = splbio();
simple_lock(&bqueue_slock);
TAILQ_FOREACH(bp, &bufqueues[BQ_LOCKED], b_freelist) {
if (bp->b_flags & B_CALL)
continue;
KASSERT(!(bp->b_flags & B_CALL));
n++;
size += bp->b_bufsize;
#ifdef DEBUG_LOCKED_LIST
@ -757,5 +760,7 @@ lfs_countlocked(int *count, long *bytes, char *msg)
#endif
*count = n;
*bytes = size;
simple_unlock(&bqueue_slock);
splx(s);
return;
}