patch-2.4.10 linux/fs/reiserfs/stree.c

• Lines: 54
• Date: Sat Sep 8 12:05:32 2001
• Orig file: v2.4.9/linux/fs/reiserfs/stree.c
• Orig date: Wed Jul 25 17:10:25 2001

diff -u --recursive --new-file v2.4.9/linux/fs/reiserfs/stree.c linux/fs/reiserfs/stree.c
@@ -52,7 +52,6 @@
  * reiserfs_paste_into_item
  * reiserfs_insert_item
  */
-#ifdef __KERNEL__
 
 #include <linux/config.h>
 #include <linux/sched.h>
@@ -62,14 +61,6 @@
 #include <linux/reiserfs_fs.h>
 #include <linux/smp_lock.h>
 
-#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)
 {
@@ -1212,10 +1203,6 @@
 		    /* 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", 
@@ -1280,11 +1267,9 @@
 		}
 #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) &&
@@ -1857,6 +1842,7 @@
 	return;
     }
     if (retval == POSITION_FOUND || retval == FILE_NOT_FOUND) {
+	pathrelse (&s_search_path);
 	reiserfs_warning ("PAP-5660: reiserfs_do_truncate: "
 			  "wrong result %d of search for %K\n", retval, &s_item_key);
 	return;