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

• Lines: 30
• Date: Fri Sep 14 14:16:08 2001
• Orig file: v2.4.9/linux/fs/reiserfs/namei.c
• Orig date: Wed Jul 25 17:10:25 2001

diff -u --recursive --new-file v2.4.9/linux/fs/reiserfs/namei.c linux/fs/reiserfs/namei.c
@@ -11,20 +11,12 @@
  * 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>
 
-#else
-
-#include "nokernel.h"
-
-#endif
-
 				/* there should be an overview right
                                    here, as there should be in every
                                    conceptual grouping of code.  This
@@ -382,7 +374,7 @@
     pathrelse (&path_to_entry);
     if (retval == NAME_FOUND) {
 	inode = reiserfs_iget (dir->i_sb, (struct cpu_key *)&(de.de_dir_id));
-	if (!inode) {
+	if (!inode || IS_ERR(inode)) {
 	    return ERR_PTR(-EACCES);
         }
     }