minor fixes

diff --git a/kernel/arch/i386/system.c b/kernel/arch/i386/system.c
index aa0aef6488a88fda17192ce134b42e378effa9ef..00e6bde35a151853c899cb0ccd029168446a5766 100644 (file)
--- 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 e3921075757f45f4ac08fb77be6c9c3b16792885..5f8a327100f6a158139dbc1ad7ad91d3ba4ed9fe 100755 (executable)
--- 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 ed04fc364c85c678089d97c61b80c27102e957b3..c75f2321a5551ac77e885cb4115b2f590a236d76 100644 (file)
--- 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 1b61d30db48ad1d71e1eeb78d09b2c08edc1b789..bdd96c72ec1b277ff0ce9c8170ebce2396ef16df 100755 (executable)
--- 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`"