diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-22 09:01:11 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-22 09:01:11 +0100 |
| commit | d24fec3991076124e069c889c530cdc69cd43fb8 (patch) | |
| tree | aba6da450fd0bf1c903f5bc559506500b15690ef /fs | |
| parent | b403b73c21fcab11411a1439867a3ead9117e5e4 (diff) | |
| parent | 8660998608cfa1077e560034db81885af8e1e885 (diff) | |
| download | kernel_goldelico_gta04-d24fec3991076124e069c889c530cdc69cd43fb8.zip kernel_goldelico_gta04-d24fec3991076124e069c889c530cdc69cd43fb8.tar.gz kernel_goldelico_gta04-d24fec3991076124e069c889c530cdc69cd43fb8.tar.bz2 | |
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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/jfs/jfs_inode.c b/fs/jfs/jfs_inode.c index c1a3e60..7f464c5 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: |