A-nokernel.patch Removes non-kernel code (conditioned by !defined( __KERNEL__ )) Doesn't change functionality in any way. diff -rubBp linux-2.4.6/fs/reiserfs/bitmap.c linux-2.4.6.cleanup/fs/reiserfs/bitmap.c --- linux-2.4.6/fs/reiserfs/bitmap.c Wed Apr 25 15:27:44 2001 +++ linux-2.4.6.cleanup/fs/reiserfs/bitmap.c Tue Jun 5 23:19:42 2001 @@ -1,7 +1,6 @@ /* * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README */ -#ifdef __KERNEL__ #include #include @@ -9,13 +8,6 @@ #include #include #include - -#else - -#include "nokernel.h" - -#endif - #ifdef CONFIG_REISERFS_CHECK diff -rubBp linux-2.4.6/fs/reiserfs/buffer2.c linux-2.4.6.cleanup/fs/reiserfs/buffer2.c --- linux-2.4.6/fs/reiserfs/buffer2.c Wed Apr 25 15:27:44 2001 +++ linux-2.4.6.cleanup/fs/reiserfs/buffer2.c Tue Jun 5 23:19:42 2001 @@ -10,20 +10,12 @@ * * Copyright (C) 1991, 1992 Linus Torvalds */ -#ifdef __KERNEL__ #include #include #include #include #include - -#else - -#include "nokernel.h" - -#endif - /* * wait_buffer_until_released diff -rubBp linux-2.4.6/fs/reiserfs/dir.c linux-2.4.6.cleanup/fs/reiserfs/dir.c --- linux-2.4.6/fs/reiserfs/dir.c Wed Apr 25 15:27:44 2001 +++ linux-2.4.6.cleanup/fs/reiserfs/dir.c Tue Jun 5 23:19:42 2001 @@ -2,8 +2,6 @@ * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README */ -#ifdef __KERNEL__ - #include #include #include @@ -12,12 +10,6 @@ #include #include #include - -#else - -#include "nokernel.h" - -#endif extern struct key MIN_KEY; diff -rubBp linux-2.4.6/fs/reiserfs/do_balan.c linux-2.4.6.cleanup/fs/reiserfs/do_balan.c --- linux-2.4.6/fs/reiserfs/do_balan.c Wed Apr 25 15:27:44 2001 +++ linux-2.4.6.cleanup/fs/reiserfs/do_balan.c Tue Jun 5 23:19:42 2001 @@ -16,20 +16,11 @@ ** **/ -#ifdef __KERNEL__ - #include #include #include #include -#else - -#include "nokernel.h" - -#endif - - #ifdef CONFIG_REISERFS_CHECK struct tree_balance * cur_tb = NULL; /* detects whether more than one @@ -1915,13 +1906,6 @@ static inline void do_balance_starts (st if (check_before_balancing (tb)) reiserfs_panic (tb->tb_sb, "PAP-12340: do_balance: locked buffers in TB"); -#ifndef __KERNEL__ - if ( atomic_read(&(PATH_PLAST_BUFFER(tb->tb_path)->b_count)) > 1 || (tb->L[0] && atomic_read(&(tb->L[0]->b_count)) > 1) || - (tb->R[0] && atomic_read(&(tb->R[0]->b_count)) > 1) ) { - print_cur_tb ("first three parameters are invalid"); - reiserfs_panic (tb->tb_sb, "PAP-12345: do_balance: counter too big"); - } -#endif /* !__KERNEL__ */ cur_tb = tb; #endif /* CONFIG_REISERFS_CHECK */ diff -rubBp linux-2.4.6/fs/reiserfs/file.c linux-2.4.6.cleanup/fs/reiserfs/file.c --- linux-2.4.6/fs/reiserfs/file.c Wed Apr 25 15:27:44 2001 +++ linux-2.4.6.cleanup/fs/reiserfs/file.c Tue Jun 5 23:19:42 2001 @@ -3,17 +3,9 @@ */ -#ifdef __KERNEL__ - #include #include #include - -#else - -#include "nokernel.h" - -#endif /* ** We pack the tails of files on file close, not at the time they are written. diff -rubBp linux-2.4.6/fs/reiserfs/fix_node.c linux-2.4.6.cleanup/fs/reiserfs/fix_node.c --- linux-2.4.6/fs/reiserfs/fix_node.c Wed Apr 25 15:27:44 2001 +++ linux-2.4.6.cleanup/fs/reiserfs/fix_node.c Tue Jun 5 23:19:42 2001 @@ -35,21 +35,12 @@ **/ -#ifdef __KERNEL__ - #include #include #include #include #include -#else - -#include "nokernel.h" - -#endif - - /* To make any changes in the tree we find a node, that contains item to be changed/deleted or position in the node we insert a new item @@ -2513,16 +2504,6 @@ int fix_nodes (int n_op_mode, if ( FILESYSTEM_CHANGED_TB (p_s_tb) ) return REPEAT_SEARCH; } - -#ifndef __KERNEL__ - if ( atomic_read (&(p_s_tbS0->b_count)) > 1 || - (p_s_tb->L[0] && atomic_read (&(p_s_tb->L[0]->b_count)) > 1) || - (p_s_tb->R[0] && atomic_read (&(p_s_tb->R[0]->b_count)) > 1) ) { - printk ("mode=%c, insert_size=%d\n", n_op_mode, p_s_tb->insert_size[0]); - print_cur_tb ("first three parameters are invalid"); - reiserfs_panic (p_s_tb->tb_sb, "PAP-8310: fix_nodes: all buffers must be hold once in one thread processing"); - } -#endif #ifdef CONFIG_REISERFS_CHECK if ( cur_tb ) { diff -rubBp linux-2.4.6/fs/reiserfs/hashes.c linux-2.4.6.cleanup/fs/reiserfs/hashes.c --- linux-2.4.6/fs/reiserfs/hashes.c Wed Apr 25 15:27:44 2001 +++ linux-2.4.6.cleanup/fs/reiserfs/hashes.c Tue Jun 5 23:19:42 2001 @@ -26,10 +26,6 @@ #define FULLROUNDS 10 /* 32 is overkill, 16 is strong crypto */ #define PARTROUNDS 6 /* 6 gets complete mixing */ -#ifndef __KERNEL__ -typedef __u32 u32; -#endif - /* a, b, c, d - data; h0, h1 - accumulated hash */ #define TEACORE(rounds) \ do { \ diff -rubBp linux-2.4.6/fs/reiserfs/ibalance.c linux-2.4.6.cleanup/fs/reiserfs/ibalance.c --- linux-2.4.6/fs/reiserfs/ibalance.c Wed Apr 25 15:27:44 2001 +++ linux-2.4.6.cleanup/fs/reiserfs/ibalance.c Tue Jun 5 23:19:42 2001 @@ -2,20 +2,11 @@ * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README */ -#ifdef __KERNEL__ - #include #include #include #include #include - -#else - -#include "nokernel.h" - -#endif - /* this is one and only function that is used outside (do_balance.c) */ int balance_internal ( diff -rubBp linux-2.4.6/fs/reiserfs/inode.c linux-2.4.6.cleanup/fs/reiserfs/inode.c --- linux-2.4.6/fs/reiserfs/inode.c Wed Apr 25 15:27:44 2001 +++ linux-2.4.6.cleanup/fs/reiserfs/inode.c Tue Jun 5 23:19:42 2001 @@ -1,7 +1,6 @@ /* * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README */ -#ifdef __KERNEL__ #include #include @@ -9,12 +8,6 @@ #include #include #include - -#else - -#include "nokernel.h" - -#endif /* args for the create parameter of reiserfs_get_block */ #define GET_BLOCK_NO_CREATE 0 /* don't create new blocks or convert tails */ diff -rubBp linux-2.4.6/fs/reiserfs/ioctl.c linux-2.4.6.cleanup/fs/reiserfs/ioctl.c --- linux-2.4.6/fs/reiserfs/ioctl.c Wed Apr 25 15:27:44 2001 +++ linux-2.4.6.cleanup/fs/reiserfs/ioctl.c Tue Jun 5 23:19:42 2001 @@ -2,20 +2,12 @@ * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README */ -#ifdef __KERNEL__ - #include #include #include #include #include #include - -#else - -#include "nokernel.h" - -#endif /* ** reiserfs_ioctl - handler for ioctl for inode diff -rubBp linux-2.4.6/fs/reiserfs/item_ops.c linux-2.4.6.cleanup/fs/reiserfs/item_ops.c --- linux-2.4.6/fs/reiserfs/item_ops.c Wed Apr 25 15:27:44 2001 +++ linux-2.4.6.cleanup/fs/reiserfs/item_ops.c Tue Jun 5 23:19:42 2001 @@ -2,18 +2,9 @@ * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README */ -#ifdef __KERNEL__ - #include #include -#else - -#include "nokernel.h" - -#endif - - // this contains item handlers for old item types: sd, direct, // indirect, directory @@ -46,14 +37,7 @@ static char * print_time (time_t t) { static char timebuf[256]; -#ifndef __KERNEL__ -// struct tm *loctime; -// loctime = localtime (&t); - sprintf (timebuf, "%s", asctime (localtime (&t))); - timebuf[strlen (timebuf) - 1] = 0; -#else sprintf (timebuf, "%ld", t); -#endif return timebuf; } diff -rubBp linux-2.4.6/fs/reiserfs/journal.c linux-2.4.6.cleanup/fs/reiserfs/journal.c --- linux-2.4.6/fs/reiserfs/journal.c Wed Apr 25 15:27:44 2001 +++ linux-2.4.6.cleanup/fs/reiserfs/journal.c Tue Jun 5 23:19:42 2001 @@ -41,8 +41,6 @@ ** log blocks to hit disk if it doesn't want to. */ -#ifdef __KERNEL__ - #include #include #include @@ -61,13 +59,6 @@ #include #include -#else - -#include "nokernel.h" - -#endif - - /* the number of mounted filesystems. This is used to decide when to ** start and kill the commit thread */ @@ -2319,7 +2310,6 @@ int journal_end_sync(struct reiserfs_tra return do_journal_end(th, p_s_sb, nblocks, COMMIT_NOW | WAIT) ; } -#ifdef __KERNEL__ int show_reiserfs_locks(void) { dump_journal_writers() ; @@ -2339,7 +2329,6 @@ printk("journal lock is %d, join lock is #endif return 0 ; } -#endif /* ** used to get memory back from async commits that are floating around diff -rubBp linux-2.4.6/fs/reiserfs/lbalance.c linux-2.4.6.cleanup/fs/reiserfs/lbalance.c --- linux-2.4.6/fs/reiserfs/lbalance.c Wed Apr 25 15:27:44 2001 +++ linux-2.4.6.cleanup/fs/reiserfs/lbalance.c Tue Jun 5 23:19:42 2001 @@ -2,19 +2,11 @@ * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README */ -#ifdef __KERNEL__ - #include #include #include #include #include - -#else - -#include "nokernel.h" - -#endif /* these are used in do_balance.c */ diff -rubBp linux-2.4.6/fs/reiserfs/namei.c linux-2.4.6.cleanup/fs/reiserfs/namei.c --- linux-2.4.6/fs/reiserfs/namei.c Wed Apr 25 15:27:44 2001 +++ linux-2.4.6.cleanup/fs/reiserfs/namei.c Tue Jun 5 23:19:42 2001 @@ -11,19 +11,11 @@ * NO WARRANTY */ -#ifdef __KERNEL__ - #include #include #include #include #include - -#else - -#include "nokernel.h" - -#endif /* there should be an overview right here, as there should be in every diff -rubBp linux-2.4.6/fs/reiserfs/objectid.c linux-2.4.6.cleanup/fs/reiserfs/objectid.c --- linux-2.4.6/fs/reiserfs/objectid.c Wed Apr 25 15:27:44 2001 +++ linux-2.4.6.cleanup/fs/reiserfs/objectid.c Tue Jun 5 23:19:42 2001 @@ -1,19 +1,12 @@ /* * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README */ -#ifdef __KERNEL__ #include #include #include #include #include - -#else - -#include "nokernel.h" - -#endif // find where objectid map starts diff -rubBp linux-2.4.6/fs/reiserfs/prints.c linux-2.4.6.cleanup/fs/reiserfs/prints.c --- linux-2.4.6/fs/reiserfs/prints.c Wed Apr 25 15:27:44 2001 +++ linux-2.4.6.cleanup/fs/reiserfs/prints.c Tue Jun 5 23:19:42 2001 @@ -1,7 +1,6 @@ /* * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README */ -#ifdef __KERNEL__ #include #include @@ -9,13 +8,6 @@ #include #include -#else - -#include "nokernel.h" -#include - -#endif - #include static char error_buf[1024]; @@ -324,17 +316,13 @@ extern struct tree_balance * cur_tb; void reiserfs_panic (struct super_block * sb, const char * fmt, ...) { -#ifdef __KERNEL__ show_reiserfs_locks() ; -#endif do_reiserfs_warning; printk ("%s", error_buf); BUG (); // console_print (error_buf); // for (;;); -#ifdef __KERNEL__ - /* comment before release */ //for (;;); @@ -354,9 +342,6 @@ void reiserfs_panic (struct super_block panic ("REISERFS: panic (device %s): %s\n", sb ? kdevname(sb->s_dev) : "sb == 0", error_buf); -#else - exit (0); -#endif } @@ -676,142 +661,6 @@ void print_cur_tb (char * mes) { printk ("%s\n%s", mes, print_tb_buf); } - - -#ifndef __KERNEL__ - -void print_bmap_block (int i, char * data, int size, int silent) -{ - int j, k; - int bits = size * 8; - int zeros = 0, ones = 0; - - - if (test_bit (0, data)) { - /* first block addressed by this bitmap block is used */ - ones ++; - if (!silent) - printf ("Busy (%d-", i * bits); - for (j = 1; j < bits; j ++) { - while (test_bit (j, data)) { - ones ++; - if (j == bits - 1) { - if (!silent) - printf ("%d)\n", j + i * bits); - goto end; - } - j++; - } - if (!silent) - printf ("%d) Free(%d-", j - 1 + i * bits, j + i * bits); - - while (!test_bit (j, data)) { - zeros ++; - if (j == bits - 1) { - if (!silent) - printf ("%d)\n", j + i * bits); - goto end; - } - j++; - } - if (!silent) - printf ("%d) Busy(%d-", j - 1 + i * bits, j + i * bits); - - j --; - end: - } - } else { - /* first block addressed by this bitmap is free */ - zeros ++; - if (!silent) - printf ("Free (%d-", i * bits); - for (j = 1; j < bits; j ++) { - k = 0; - while (!test_bit (j, data)) { - k ++; - if (j == bits - 1) { - if (!silent) - printf ("%d)\n", j + i * bits); - zeros += k; - goto end2; - } - j++; - } - zeros += k; - if (!silent) - printf ("%d) Busy(%d-", j - 1 + i * bits, j + i * bits); - - k = 0; - while (test_bit (j, data)) { - ones ++; - if (j == bits - 1) { - if (!silent) - printf ("%d)\n", j + i * bits); - ones += k; - goto end2; - } - j++; - } - ones += k; - if (!silent) - printf ("%d) Busy(%d-", j - 1 + i * bits, j + i * bits); - - j --; - end2: - } - } - - printf ("used %d, free %d\n", ones, zeros); -} - - -/* if silent == 1, do not print details */ -void print_bmap (struct super_block * s, int silent) -{ - int bmapnr = SB_BMAP_NR (s); - int i; - - printf ("Bitmap blocks are:\n"); - for (i = 0; i < bmapnr; i ++) { - printf ("#%d: block %lu: ", i, SB_AP_BITMAP(s)[i]->b_blocknr); - print_bmap_block (i, SB_AP_BITMAP(s)[i]->b_data, s->s_blocksize, silent); - } - -} - - - - -void print_objectid_map (struct super_block * s) -{ - int i; - struct reiserfs_super_block * rs; - unsigned long * omap; - - rs = SB_DISK_SUPER_BLOCK (s); - omap = (unsigned long *)(rs + 1); - printk ("Map of objectids\n"); - - for (i = 0; i < rs->s_oid_cursize; i ++) { - if (i % 2 == 0) - printk ("busy(%lu-%lu) ", omap[i], omap[i+1] - 1); - else - printk ("free(%lu-%lu) ", - omap[i], ((i+1) == rs->s_oid_cursize) ? -1 : omap[i+1] - 1); - } - printk ("\n"); - - printk ("Object id array has size %d (max %d):", rs->s_oid_cursize, - rs->s_oid_maxsize); - - for (i = 0; i < rs->s_oid_cursize; i ++) - printk ("%lu ", omap[i]); - printk ("\n"); - -} - -#endif /* #ifndef __KERNEL__ */ - static void check_leaf_block_head (struct buffer_head * bh) { diff -rubBp linux-2.4.6/fs/reiserfs/resize.c linux-2.4.6.cleanup/fs/reiserfs/resize.c --- linux-2.4.6/fs/reiserfs/resize.c Wed Apr 25 15:27:44 2001 +++ linux-2.4.6.cleanup/fs/reiserfs/resize.c Tue Jun 5 23:19:42 2001 @@ -8,8 +8,6 @@ * The kernel part of the (on-line) reiserfs resizer. */ -#ifdef __KERNEL__ - #include #include #include @@ -17,12 +15,6 @@ #include #include #include - -#else - -#include "nokernel.h" - -#endif int reiserfs_resize (struct super_block * s, unsigned long block_count_new) { diff -rubBp linux-2.4.6/fs/reiserfs/stree.c linux-2.4.6.cleanup/fs/reiserfs/stree.c --- linux-2.4.6/fs/reiserfs/stree.c Wed Apr 25 15:27:44 2001 +++ linux-2.4.6.cleanup/fs/reiserfs/stree.c Tue Jun 5 23:19:42 2001 @@ -52,7 +52,6 @@ * reiserfs_paste_into_item * reiserfs_insert_item */ -#ifdef __KERNEL__ #include #include @@ -62,14 +61,6 @@ #include #include -#else - -#include "nokernel.h" - -#endif - - - /* Does the buffer contain a disk block which is in the tree. */ inline int B_IS_IN_TREE (struct buffer_head * p_s_bh) { @@ -1204,10 +1195,6 @@ static char prepare_for_delete_or_cut( /* Block is locked or held more than by one holder and by journal. */ -#ifndef __KERNEL__ - reiserfs_panic(p_s_sb, "PAP-5270: prepare_for_delete_or_cut: b_count != 1"); -#endif - #ifdef CONFIG_REISERFS_CHECK if (n_repeat_counter && (n_repeat_counter % 100000) == 0) { printk("prepare_for_delete, waiting on buffer %lu, b_count %d, %s%cJDIRTY %cJDIRTY_WAIT\n", @@ -1295,11 +1282,9 @@ static char prepare_for_delete_or_cut( } #endif -#ifdef __KERNEL__ run_task_queue(&tq_disk); current->policy |= SCHED_YIELD; schedule(); -#endif } /* This loop can be optimized. */ } while ( (*p_n_removed < n_unfm_number || need_research) && diff -rubBp linux-2.4.6/fs/reiserfs/super.c linux-2.4.6.cleanup/fs/reiserfs/super.c --- linux-2.4.6/fs/reiserfs/super.c Wed Apr 25 15:27:44 2001 +++ linux-2.4.6.cleanup/fs/reiserfs/super.c Tue Jun 5 23:19:42 2001 @@ -11,8 +11,6 @@ * NO WARRANTY */ -#ifdef __KERNEL__ - #include #include #include @@ -22,13 +20,6 @@ #include #include -#else - -#include "nokernel.h" -#include // for simple_strtoul - -#endif - #define SUPPORT_OLD_FORMAT #define REISERFS_OLD_BLOCKSIZE 4096 @@ -866,8 +857,6 @@ int reiserfs_statfs (struct super_block return 0; } -#ifdef __KERNEL__ - static DECLARE_FSTYPE_DEV(reiserfs_fs_type,"reiserfs",reiserfs_read_super); // @@ -890,8 +879,6 @@ static void __exit exit_reiserfs_fs(void module_init(init_reiserfs_fs) ; module_exit(exit_reiserfs_fs) ; - -#endif diff -rubBp linux-2.4.6/fs/reiserfs/tail_conversion.c linux-2.4.6.cleanup/fs/reiserfs/tail_conversion.c --- linux-2.4.6/fs/reiserfs/tail_conversion.c Wed Apr 25 15:27:44 2001 +++ linux-2.4.6.cleanup/fs/reiserfs/tail_conversion.c Tue Jun 5 23:19:42 2001 @@ -2,20 +2,11 @@ * Copyright 1999 Hans Reiser, see reiserfs/README for licensing and copyright details */ -#ifdef __KERNEL__ - #include #include #include #include #include - -#else - -#include "nokernel.h" - -#endif - /* access to tail : when one is going to read tail it must make sure, that is not running. direct2indirect and indirect2direct can not run concurrently */