Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

[firefly-linux-kernel-4.4.55.git] / fs / logfs / dir.c

diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c
index 1afae26cf2364936d3053801c41f12cbb06f29d9..b3ff3d894165f6ae0ef2108e656f9eef904f4fa8 100644 (file)
--- a/fs/logfs/dir.c
+++ b/fs/logfs/dir.c
@@ -371,11 +371,9 @@ static struct dentry *logfs_lookup(struct inode *dir, struct dentry *dentry,
        page_cache_release(page);
 
        inode = logfs_iget(dir->i_sb, ino);
-       if (IS_ERR(inode)) {
+       if (IS_ERR(inode))
                printk(KERN_ERR"LogFS: Cannot read inode #%llx for dentry (%lx, %lx)n",
                                ino, dir->i_ino, index);
-               return ERR_CAST(inode);
-       }
        return d_splice_alias(inode, dentry);
 }