From 2f256f95f47fc4ef07afefb788d54ba734617475 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 8 Jul 2011 20:57:47 -0400
Subject: [PATCH] --- yaml --- r: 257358 b: refs/heads/master c:
 0c1aa9a952c3608eb17bf990466f1491d1ee8b6c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 01e76a645097..19e5e0ef41bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b4b299cc7b6adfb9401bf7f826a80f190b971be
+refs/heads/master: 0c1aa9a952c3608eb17bf990466f1491d1ee8b6c
diff --git a/trunk/fs/squashfs/namei.c b/trunk/fs/squashfs/namei.c
index 4bc63ac64bc0..51b36958492b 100644
--- a/trunk/fs/squashfs/namei.c
+++ b/trunk/fs/squashfs/namei.c
@@ -232,10 +232,7 @@ static struct dentry *squashfs_lookup(struct inode *dir, struct dentry *dentry,
 
 exit_lookup:
 	kfree(dire);
-	if (inode)
-		return d_splice_alias(inode, dentry);
-	d_add(dentry, inode);
-	return ERR_PTR(0);
+	return d_splice_alias(inode, dentry);
 
 data_error:
 	err = -EIO;