ARM: 7068/1: process: change from __backtrace to dump_stack in show_regs

[pandora-kernel.git] / fs / squashfs / namei.c

diff --git a/fs/squashfs/namei.c b/fs/squashfs/namei.c
index 4bc63ac..0682b38 100644 (file)
--- a/fs/squashfs/namei.c
+++ b/fs/squashfs/namei.c
@@ -220,11 +220,6 @@ static struct dentry *squashfs_lookup(struct inode *dir, struct dentry *dentry,
                                        blk, off, ino_num);
 
                                inode = squashfs_iget(dir->i_sb, ino, ino_num);
-                               if (IS_ERR(inode)) {
-                                       err = PTR_ERR(inode);
-                                       goto failed;
-                               }
-
                                goto exit_lookup;
                        }
                }
@@ -232,10 +227,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;