From cbd8e1a74515f70d8b9c6ab61d5362f8d1366dcb Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Sat, 14 Jan 2006 13:21:09 -0800
Subject: [PATCH] --- yaml --- r: 18514 b: refs/heads/master c:
 2ff6b1c2575f13885c1d5291e4283682ad9a41cd h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/isofs/namei.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 12b0a306e165..ad1877f40549 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba7fe369875075c3b0def9887afb7a44fa88175e
+refs/heads/master: 2ff6b1c2575f13885c1d5291e4283682ad9a41cd
diff --git a/trunk/fs/isofs/namei.c b/trunk/fs/isofs/namei.c
index e37e82b7cbf0..e7ba0c30e071 100644
--- a/trunk/fs/isofs/namei.c
+++ b/trunk/fs/isofs/namei.c
@@ -185,8 +185,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);
 }