From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Sat, 14 Jan 2006 21:21:09 +0000 (-0800)
Subject: [PATCH] isofs: remove d_splice_alias NULL check from isofs_lookup
X-Git-Tag: v2.6.16-rc1~131
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ff6b1c2575f13885c1d5291e4283682ad9a41cd;p=linux-2.6

[PATCH] isofs: remove d_splice_alias NULL check from isofs_lookup

Remove redundant NULL check in isofs_lookup() as d_splice_alias() can take
NULL inode as input.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c
index e37e82b7cb..e7ba0c30e0 100644
--- a/fs/isofs/namei.c
+++ b/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);
 }