X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2Fisofs%2Fnamei.c;h=c04b3a14a3e94b07744214a18de0a9452d35b3b7;hb=108f39a1b3b1e4b28ca8cc156f06171445499d21;hp=e37e82b7cbf0127281fb12deca7475810906674a;hpb=c0d6f9663b30a09ed725229b2d50391268c8538e;p=powerpc.git

diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c
index e37e82b7cb..c04b3a14a3 100644
--- a/fs/isofs/namei.c
+++ b/fs/isofs/namei.c
@@ -6,7 +6,6 @@
  *  (C) 1991  Linus Torvalds - minix filesystem
  */
 
-#include <linux/config.h>	/* Joliet? */
 #include <linux/smp_lock.h>
 #include "isofs.h"
 
@@ -185,8 +184,5 @@ struct dentry *isofs_lookup(struct inode * dir, struct dentry * dentry, struct n
 		}
 	}
 	unlock_kernel();
-	if (inode)
-		return d_splice_alias(inode, dentry);
-	d_add(dentry, inode);
-	return NULL;
+	return d_splice_alias(inode, dentry);
 }