---

yaml --- r: 257358 b: refs/heads/master c: 0c1aa9a h: refs/heads/master v: v3
git-mirror · Jul 20, 2011 · 2f256f9 · 2f256f9
1 parent 7afab7e
commit 2f256f9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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;