From 6c66b99b6bb601b2139a6a4028ad87c1c9e0bd96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 28 May 2003 01:04:53 +0000 Subject: [PATCH] The fs-shell kernel's PANIC() now calls the userland debugger. Fixed a wrong printf argument (block number is %Ld) in release_block(). git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3361 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/tests/add-ons/kernel/file_systems/fs_shell/cache.c | 9 +++++---- src/tests/add-ons/kernel/file_systems/fs_shell/kernel.c | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/tests/add-ons/kernel/file_systems/fs_shell/cache.c b/src/tests/add-ons/kernel/file_systems/fs_shell/cache.c index 9d66a92e0f..1f7bbb8cf4 100644 --- a/src/tests/add-ons/kernel/file_systems/fs_shell/cache.c +++ b/src/tests/add-ons/kernel/file_systems/fs_shell/cache.c @@ -504,9 +504,9 @@ real_dump_cache_list(cache_ent_list *cel) kprintf("starting from LRU end:\n"); - for(ce=cel->lru; ce; ce=ce->next) { + for (ce = cel->lru; ce; ce = ce->next) { kprintf("ce 0x%.8lx dev %2d bnum %6ld lock %d flag %d arg 0x%.8lx " - "clone 0x%.8lx\n", (ulong)ce, ce->dev, ce->block_num,ce->lock, + "clone 0x%.8lx\n", (ulong)ce, ce->dev, ce->block_num, ce->lock, ce->flags, (ulong)ce->arg, (ulong)ce->clone); } kprintf("MRU end\n"); @@ -1271,7 +1271,7 @@ set_blocks_info(int dev, fs_off_t *blocks, int nblocks, printf("sbi: whoa nellie! ce @ 0x%lx (%ld) has lock == %d\n", (ulong)ce, ce->block_num, ce->lock); } - + if (ce->lock == 0) { delete_from_list(&bc.locked, ce); add_to_head(&bc.normal, ce); @@ -1384,7 +1384,7 @@ real_remove_cached_blocks(int dev, int allow_writes, cache_ent_list *cel) } if (ce->lock != 0 || (ce->flags & CE_BUSY)) { - printf("*** remove_cached_dev: block %ld has lock = %d, flags " + printf("*** remove_cached_dev: block %Ld has lock = %d, flags " "0x%x! ce @ 0x%lx\n", ce->block_num, ce->lock, ce->flags, (ulong)ce); } @@ -1554,6 +1554,7 @@ release_block(int dev, fs_off_t bnum) } ce->lock--; + if (ce->lock < 0) { printf("rlsb: whoa nellie! ce %ld has lock == %d\n", ce->block_num, ce->lock); diff --git a/src/tests/add-ons/kernel/file_systems/fs_shell/kernel.c b/src/tests/add-ons/kernel/file_systems/fs_shell/kernel.c index bc7ded1f49..b0e4266f71 100644 --- a/src/tests/add-ons/kernel/file_systems/fs_shell/kernel.c +++ b/src/tests/add-ons/kernel/file_systems/fs_shell/kernel.c @@ -223,7 +223,7 @@ PANIC(char *s, ...) vfprintf(stdout, s, list); va_end(list); - exit(-1); + debugger("fs shell kernel panic!"); }