diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 08:31:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 08:31:22 -0800 |
| commit | c99516ca854770000c277b2680a15581c691e18c (patch) | |
| tree | b2bc5a297f3996668cea3f9445645d25b607f644 /fs | |
| parent | 72f318897e50c29b91efd1ed24515a93c138a2ba (diff) | |
| parent | 0ce8c0109f548ed75535d96ec5a347b410ed1472 (diff) | |
| download | linux-c99516ca854770000c277b2680a15581c691e18c.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
ext[34]: avoid i_nlink warnings triggered by drop_nlink/inc_nlink kludge in symlink()
exofs: oops after late failure in mount
devpts: fix double-free on mount failure
... and the same for gadgetfs
functionfs: unfuck failure exits on mount
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/devpts/inode.c | 4 | ||||
| -rw-r--r-- | fs/exofs/super.c | 2 | ||||
| -rw-r--r-- | fs/ext3/namei.c | 2 | ||||
| -rw-r--r-- | fs/ext4/namei.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index 79673eb71151..c4e2a58a2e82 100644 --- a/fs/devpts/inode.c +++ b/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; } diff --git a/fs/exofs/super.c b/fs/exofs/super.c index 8addfe314dc7..d22cd168c6ee 100644 --- a/fs/exofs/super.c +++ b/fs/exofs/super.c @@ -838,6 +838,8 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent) ret = bdi_setup_and_register(&sbi->bdi, "exofs", BDI_CAP_MAP_COPY); if (ret) { EXOFS_DBGMSG("Failed to bdi_setup_and_register\n"); + dput(sb->s_root); + sb->s_root = NULL; goto free_sbi; } diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index 4f35b2f315d4..d269821203fd 100644 --- a/fs/ext3/namei.c +++ b/fs/ext3/namei.c @@ -2272,7 +2272,7 @@ retry: err = PTR_ERR(handle); goto err_drop_inode; } - inc_nlink(inode); + set_nlink(inode, 1); err = ext3_orphan_del(handle, inode); if (err) { ext3_journal_stop(handle); diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 86edc45b52a4..2043f482375d 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -2315,7 +2315,7 @@ retry: err = PTR_ERR(handle); goto err_drop_inode; } - inc_nlink(inode); + set_nlink(inode, 1); err = ext4_orphan_del(handle, inode); if (err) { ext4_journal_stop(handle); |