Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx

[linux-2.6] / fs / gfs2 / ops_export.c

diff --git a/fs/gfs2/ops_export.c b/fs/gfs2/ops_export.c
index b9da62348a877303a777884c35f08c2083e640d5..990d9f4bc463588df8f24e94f9439f4750e8f951 100644 (file)
--- a/fs/gfs2/ops_export.c
+++ b/fs/gfs2/ops_export.c
@@ -143,7 +143,7 @@ static struct dentry *gfs2_get_parent(struct dentry *child)
         * have to return that as a(n invalid) pointer to dentry.
         */
        if (IS_ERR(inode))
-               return ERR_PTR(PTR_ERR(inode));
+               return ERR_CAST(inode);
 
        dentry = d_alloc_anon(inode);
        if (!dentry) {
@@ -204,8 +204,6 @@ static struct dentry *gfs2_get_dentry(struct super_block *sb,
        inode = gfs2_inode_lookup(sb, DT_UNKNOWN,
                                        inum->no_addr,
                                        0, 0);
-       if (!inode)
-               goto fail;
        if (IS_ERR(inode)) {
                error = PTR_ERR(inode);
                goto fail;