From 8f95dc8729437a6546a3777106f64d1c671d8ac3 Mon Sep 17 00:00:00 2001 From: "Alfred M. Szmidt" Date: Wed, 1 Dec 2004 06:10:11 +0000 Subject: 2004-09-07 Neal H. Walfield * linux/dev/glue/block.c (__brelse): Unconditionally kfree BH. (getblk): Unconditionally kalloc BH. * kern/kalloc.c [!NDEBUG] (kalloc_init_called): New static variable. (kalloc_init): Assert that kalloc_init_called is zero. [! NDEBUG] Set kalloc_init_called to 1 on success. (kalloc): Assert that kalloc_init_called is non-zero. (kget): Likewise. (kfree): Likewise. --- linux/dev/glue/block.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'linux') diff --git a/linux/dev/glue/block.c b/linux/dev/glue/block.c index d65acac..5267474 100644 --- a/linux/dev/glue/block.c +++ b/linux/dev/glue/block.c @@ -354,22 +354,17 @@ struct buffer_head * getblk (kdev_t dev, int block, int size) { struct buffer_head *bh; - static struct buffer_head bhead; assert (size <= PAGE_SIZE); - if (! linux_auto_config) - bh = (struct buffer_head *) kalloc (sizeof (struct buffer_head)); - else - bh = &bhead; + bh = (struct buffer_head *) kalloc (sizeof (struct buffer_head)); if (bh) { memset (bh, 0, sizeof (struct buffer_head)); bh->b_data = alloc_buffer (size); if (! bh->b_data) { - if (! linux_auto_config) - kfree ((vm_offset_t) bh, sizeof (struct buffer_head)); + kfree ((vm_offset_t) bh, sizeof (struct buffer_head)); return NULL; } bh->b_dev = dev; @@ -385,8 +380,7 @@ void __brelse (struct buffer_head *bh) { free_buffer (bh->b_data, bh->b_size); - if (! linux_auto_config) - kfree ((vm_offset_t) bh, sizeof (*bh)); + kfree ((vm_offset_t) bh, sizeof (*bh)); } /* Allocate a buffer of SIZE bytes and fill it with data -- cgit v1.2.3