From 3fc95c6232911a528783f32f686470bd8da1fecb Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 8 Jan 2012 19:40:27 -0500 Subject: [PATCH] --- yaml --- r: 280644 b: refs/heads/master c: 3850aba74873aa47fefe6900b99f42f5e656a6e7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/devpts/inode.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c84b482e561d..104fbd6ef928 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87da5b3264c8514b85c6c6e8ef51b9440eee2030 +refs/heads/master: 3850aba74873aa47fefe6900b99f42f5e656a6e7 diff --git a/trunk/fs/devpts/inode.c b/trunk/fs/devpts/inode.c index 79673eb71151..c4e2a58a2e82 100644 --- a/trunk/fs/devpts/inode.c +++ b/trunk/fs/devpts/inode.c @@ -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; }