Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[karo-tx-linux.git] / fs / exofs / super.c

diff --git a/fs/exofs/super.c b/fs/exofs/super.c
index 6658a50530a068fefb3ec22de0b7d961bc6dc869..1076a4233b3962e34df904f55f9923dbdec2b48f 100644 (file)
--- a/fs/exofs/super.c
+++ b/fs/exofs/super.c
@@ -122,7 +122,7 @@ static int parse_options(char *options, struct exofs_mountopt *opts)
                        if (match_int(&args[0], &option))
                                return -EINVAL;
                        if (option <= 0) {
-                               EXOFS_ERR("Timout must be > 0");
+                               EXOFS_ERR("Timeout must be > 0");
                                return -EINVAL;
                        }
                        opts->timeout = option * HZ;
@@ -958,7 +958,7 @@ static struct dentry *exofs_get_parent(struct dentry *child)
        if (!ino)
                return ERR_PTR(-ESTALE);
 
-       return d_obtain_alias(exofs_iget(d_inode(child)->i_sb, ino));
+       return d_obtain_alias(exofs_iget(child->d_sb, ino));
 }
 
 static struct inode *exofs_nfs_get_inode(struct super_block *sb,