aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-10-22 09:01:11 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2013-10-22 09:01:11 +0100
commitd24fec3991076124e069c889c530cdc69cd43fb8 (patch)
treeaba6da450fd0bf1c903f5bc559506500b15690ef /fs
parentb403b73c21fcab11411a1439867a3ead9117e5e4 (diff)
parent8660998608cfa1077e560034db81885af8e1e885 (diff)
downloadlinux-d24fec3991076124e069c889c530cdc69cd43fb8.tar.gz
Merge tag 'jfs-3.12' of git://github.com/kleikamp/linux-shaggy
Pull jfs bugfix from David Kleikamp: "Just a patch to fix an oops in an error path" * tag 'jfs-3.12' of git://github.com/kleikamp/linux-shaggy: jfs: fix error path in ialloc
Diffstat (limited to 'fs')
-rw-r--r--fs/jfs/jfs_inode.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/jfs/jfs_inode.c b/fs/jfs/jfs_inode.c
index c1a3e603279..7f464c513ba 100644
--- a/fs/jfs/jfs_inode.c
+++ b/fs/jfs/jfs_inode.c
@@ -95,7 +95,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
if (insert_inode_locked(inode) < 0) {
rc = -EINVAL;
- goto fail_unlock;
+ goto fail_put;
}
inode_init_owner(inode, parent, mode);
@@ -156,7 +156,6 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
fail_drop:
dquot_drop(inode);
inode->i_flags |= S_NOQUOTA;
-fail_unlock:
clear_nlink(inode);
unlock_new_inode(inode);
fail_put: