diff options
author | Mark Brown <broonie@linaro.org> | 2013-11-21 12:56:52 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-11-21 12:56:52 +0000 |
commit | 16ec790938d4f356c82fab27b9a9adf4d6fe19a6 (patch) | |
tree | 8158b4c88b59391274d539a7e8e6985446d900e7 /fs/jfs/jfs_inode.c | |
parent | e64001e8efc107992fd835770f6383d0dc731594 (diff) | |
parent | 254dc326dbfd23c2678fafad1b84fc0e42ac4374 (diff) |
Merge tag 'ib-asoc-1' of git://git.linaro.org/people/ljones/mfd into asoc-arizona
Immutable branch for ASoC, as requested by Mark Brown
Diffstat (limited to 'fs/jfs/jfs_inode.c')
-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 c1a3e603279c..7f464c513ba0 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: |