From 51fdce1d368cc3ed9e666474ebd40d34aff37bbf Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Wed, 19 Nov 2008 14:10:33 +0000 Subject: [PATCH] minor fixes --- kernel/arch/i386/system.c | 2 +- kernel/system.c | 7 ------- servers/mfs/cache.c | 6 +++--- tools/release.sh | 2 +- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/kernel/arch/i386/system.c b/kernel/arch/i386/system.c index aa0aef648..00e6bde35 100644 --- a/kernel/arch/i386/system.c +++ b/kernel/arch/i386/system.c @@ -60,7 +60,7 @@ PUBLIC void arch_shutdown(int how) c != '\'' && c != '"' && c != '\\' && c != ';') { mybuffer[dest] = c; - } else mybuffer[dest] = '|'; + } else mybuffer[dest] = ' '; DECSOURCE; dest--; diff --git a/kernel/system.c b/kernel/system.c index e39210757..5f8a32710 100755 --- a/kernel/system.c +++ b/kernel/system.c @@ -78,13 +78,6 @@ PUBLIC void sys_task() while (TRUE) { struct proc *restarting; -#if 0 -if(!(n++ % 100000)) { - int i; - kprintf("switch %8d reload %8d\n", cr3switch, cr3reload); -} -#endif - restarting = vmrestart_check(&m); softnotify_check(); if(softnotify) diff --git a/servers/mfs/cache.c b/servers/mfs/cache.c index ed04fc364..c75f2321a 100644 --- a/servers/mfs/cache.c +++ b/servers/mfs/cache.c @@ -65,6 +65,7 @@ int only_search; /* if NO_READ, don't read, else act normal */ /* Block needed has been found. */ if (bp->b_count == 0) rm_lru(bp); bp->b_count++; /* record that block is in use */ + ASSERT(bp->b_bytes == fs_block_size); ASSERT(bp->b_dev == dev); ASSERT(bp->b_dev != NO_DEV); ASSERT(bp->bp); @@ -112,9 +113,8 @@ int only_search; /* if NO_READ, don't read, else act normal */ if(bp->b_bytes < fs_block_size) { static int n = 0; phys_bytes ph; - if(bp->b_bytes > 0) - printf("MFS: WARNING: throwing away %d bytes!\n", - bp->b_bytes); + ASSERT(!bp->bp); + ASSERT(bp->b_bytes == 0); if(!(bp->bp = alloc_contig(fs_block_size, 0, &ph))) panic(__FILE__,"couldn't allocate FS buffer", n); bp->b_bytes = fs_block_size; diff --git a/tools/release.sh b/tools/release.sh index 1b61d30db..bdd96c72e 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -132,7 +132,7 @@ do esac done -USRMB=400 +USRMB=150 USRBLOCKS="`expr $USRMB \* 1024 \* 1024 / $BS`" USRSECTS="`expr $USRMB \* 1024 \* 2`" -- 2.44.0