Module Name: src
Committed By: rmind
Date: Wed Mar 23 00:58:40 UTC 2011
Modified Files:
src/sys/kern: vfs_bio.c
src/sys/ufs/lfs: lfs_segment.c
Log Message:
G/C count_lock_queue (unused for 12 years)
To generate a diff of this commit:
cvs rdiff -u -r1.227 -r1.228 src/sys/kern/vfs_bio.c
cvs rdiff -u -r1.217 -r1.218 src/sys/ufs/lfs/lfs_segment.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/kern/vfs_bio.c
diff -u src/sys/kern/vfs_bio.c:1.227 src/sys/kern/vfs_bio.c:1.228
--- src/sys/kern/vfs_bio.c:1.227 Mon Jan 17 07:13:32 2011
+++ src/sys/kern/vfs_bio.c Wed Mar 23 00:58:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_bio.c,v 1.227 2011/01/17 07:13:32 uebayasi Exp $ */
+/* $NetBSD: vfs_bio.c,v 1.228 2011/03/23 00:58:38 rmind Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -123,7 +123,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.227 2011/01/17 07:13:32 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.228 2011/03/23 00:58:38 rmind Exp $");
#include "opt_bufcache.h"
@@ -181,7 +181,6 @@
static void buf_mrelease(void *, size_t);
static void binsheadfree(buf_t *, struct bqueue *);
static void binstailfree(buf_t *, struct bqueue *);
-int count_lock_queue(void); /* XXX */
#ifdef DEBUG
static int checkfreelist(buf_t *, struct bqueue *, int);
#endif
@@ -1577,22 +1576,6 @@
}
/*
- * Return a count of buffers on the "locked" queue.
- */
-int
-count_lock_queue(void)
-{
- buf_t *bp;
- int n = 0;
-
- mutex_enter(&bufcache_lock);
- TAILQ_FOREACH(bp, &bufqueues[BQ_LOCKED].bq_queue, b_freelist)
- n++;
- mutex_exit(&bufcache_lock);
- return (n);
-}
-
-/*
* Wait for all buffers to complete I/O
* Return the number of "stuck" buffers.
*/
Index: src/sys/ufs/lfs/lfs_segment.c
diff -u src/sys/ufs/lfs/lfs_segment.c:1.217 src/sys/ufs/lfs/lfs_segment.c:1.218
--- src/sys/ufs/lfs/lfs_segment.c:1.217 Wed Jul 21 17:52:13 2010
+++ src/sys/ufs/lfs/lfs_segment.c Wed Mar 23 00:58:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_segment.c,v 1.217 2010/07/21 17:52:13 hannken Exp $ */
+/* $NetBSD: lfs_segment.c,v 1.218 2011/03/23 00:58:39 rmind Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.217 2010/07/21 17:52:13 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.218 2011/03/23 00:58:39 rmind Exp $");
#ifdef DEBUG
# define vndebug(vp, str) do { \
@@ -108,7 +108,6 @@
MALLOC_JUSTDEFINE(M_SEGMENT, "LFS segment", "Segment for LFS");
-extern int count_lock_queue(void);
extern kmutex_t vnode_free_list_lock; /* XXX */
static void lfs_generic_callback(struct buf *, void (*)(struct buf *));
