patch-2.4.2 linux/fs/reiserfs/namei.c

• Lines: 40
• Date: Sun Feb 18 19:49:44 2001
• Orig file: v2.4.1/linux/fs/reiserfs/namei.c
• Orig date: Sat Feb 3 19:51:31 2001

diff -u --recursive --new-file v2.4.1/linux/fs/reiserfs/namei.c linux/fs/reiserfs/namei.c
@@ -1,11 +1,21 @@
 /*
  * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README
+ *
+ * Trivial changes by Alan Cox to remove EHASHCOLLISION for compatibility
+ *
+ * Trivial Changes:
+ * Rights granted to Hans Reiser to redistribute under other terms providing
+ * he accepts all liability including but not limited to patent, fitness
+ * for purpose, and direct or indirect claims arising from failure to perform.
+ *
+ * NO WARRANTY
  */
 
 #ifdef __KERNEL__
 
 #include <linux/config.h>
 #include <linux/sched.h>
+#include <linux/bitops.h>
 #include <linux/reiserfs_fs.h>
 #include <linux/smp_lock.h>
 
@@ -472,7 +482,7 @@
 	    if (buffer != small_buf)
 		reiserfs_kfree (buffer, buflen, dir->i_sb);
 	    pathrelse (&path);
-	    return -EHASHCOLLISION;//EBADSLT
+	    return -EBUSY; //HASHCOLLISION;//EBADSLT
 	}
 	/* adjust offset of directory enrty */
 	deh->deh_offset = cpu_to_le32 (SET_GENERATION_NUMBER (deh_offset (deh), gen_number));
@@ -485,7 +495,7 @@
 	    if (buffer != small_buf)
 		reiserfs_kfree (buffer, buflen, dir->i_sb);
 	    pathrelse (&path);
-	    return -EHASHCOLLISION;
+	    return -EBUSY;
 	}
     } else {
 	deh->deh_offset = cpu_to_le32 (SET_GENERATION_NUMBER (le32_to_cpu (deh->deh_offset), 0));