Commit e83b40a4 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Dave Kleikamp

JFS: remove some cruft left over from the pre-mempool metapage code

parent dd599472
...@@ -27,16 +27,13 @@ ...@@ -27,16 +27,13 @@
#include "jfs_txnmgr.h" #include "jfs_txnmgr.h"
#include "jfs_debug.h" #include "jfs_debug.h"
extern struct task_struct *jfsCommitTask;
static spinlock_t meta_lock = SPIN_LOCK_UNLOCKED; static spinlock_t meta_lock = SPIN_LOCK_UNLOCKED;
static wait_queue_head_t meta_wait;
#ifdef CONFIG_JFS_STATISTICS #ifdef CONFIG_JFS_STATISTICS
struct { struct {
uint pagealloc; /* # of page allocations */ uint pagealloc; /* # of page allocations */
uint pagefree; /* # of page frees */ uint pagefree; /* # of page frees */
uint lockwait; /* # of sleeping lock_metapage() calls */ uint lockwait; /* # of sleeping lock_metapage() calls */
uint allocwait; /* # of sleeping alloc_metapage() calls */
} mpStat; } mpStat;
#endif #endif
...@@ -134,11 +131,6 @@ static void mp_mempool_free(void *element, void *pool_data) ...@@ -134,11 +131,6 @@ static void mp_mempool_free(void *element, void *pool_data)
int __init metapage_init(void) int __init metapage_init(void)
{ {
/*
* Initialize wait queue
*/
init_waitqueue_head(&meta_wait);
/* /*
* Allocate the metapage structures * Allocate the metapage structures
*/ */
...@@ -624,12 +616,10 @@ int jfs_mpstat_read(char *buffer, char **start, off_t offset, int length, ...@@ -624,12 +616,10 @@ int jfs_mpstat_read(char *buffer, char **start, off_t offset, int length,
"=======================\n" "=======================\n"
"page allocations = %d\n" "page allocations = %d\n"
"page frees = %d\n" "page frees = %d\n"
"lock waits = %d\n" "lock waits = %d\n",
"allocation waits = %d\n",
mpStat.pagealloc, mpStat.pagealloc,
mpStat.pagefree, mpStat.pagefree,
mpStat.lockwait, mpStat.lockwait);
mpStat.allocwait);
begin = offset; begin = offset;
*start = buffer + begin; *start = buffer + begin;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment