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

[cascardo/linux.git] / fs / devpts / inode.c

diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index d5d5297..c4e2a58 100644 (file)
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -246,9 +246,9 @@ static int devpts_remount(struct super_block *sb, int *flags, char *data)
        return err;
 }
 
-static int devpts_show_options(struct seq_file *seq, struct vfsmount *vfs)
+static int devpts_show_options(struct seq_file *seq, struct dentry *root)
 {
-       struct pts_fs_info *fsi = DEVPTS_SB(vfs->mnt_sb);
+       struct pts_fs_info *fsi = DEVPTS_SB(root->d_sb);
        struct pts_mount_opts *opts = &fsi->mount_opts;
 
        if (opts->setuid)
@@ -301,7 +301,7 @@ devpts_fill_super(struct super_block *s, void *data, int silent)
 
        inode = new_inode(s);
        if (!inode)
-               goto free_fsi;
+               goto fail;
        inode->i_ino = 1;
        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
        inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
@@ -316,8 +316,6 @@ devpts_fill_super(struct super_block *s, void *data, int silent)
        printk(KERN_ERR "devpts: get root dentry failed\n");
        iput(inode);
 
-free_fsi:
-       kfree(s->s_fs_info);
 fail:
        return -ENOMEM;
 }