diff options
| author | Chao Yu <chao@kernel.org> | 2016-03-10 22:24:23 +0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-03-17 21:19:46 -0700 |
| commit | d726732c7ce951da5468b577a89ac26ce3f5a860 (patch) | |
| tree | 51d1cc310d3daef91d8c4671fdcd98e93db2a223 /fs/f2fs | |
| parent | 291bf80becdfbb4cfc726dbd1811b28cedb4d907 (diff) | |
| download | linux-stable-d726732c7ce951da5468b577a89ac26ce3f5a860.tar.gz linux-stable-d726732c7ce951da5468b577a89ac26ce3f5a860.tar.bz2 linux-stable-d726732c7ce951da5468b577a89ac26ce3f5a860.zip | |
f2fs: fix to avoid unneeded unlock_new_inode
During ->lookup, I_NEW state of inode was been cleared in f2fs_iget,
so in error path, we don't need to clear it again.
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs')
| -rw-r--r-- | fs/f2fs/namei.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c index 7b07a4799952..7876f1052101 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c @@ -308,13 +308,13 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry, !fscrypt_has_permitted_context(dir, inode)) { bool nokey = f2fs_encrypted_inode(inode) && !fscrypt_has_encryption_key(inode); - iput(inode); - return nokey ? ERR_PTR(-ENOKEY) : ERR_PTR(-EPERM); + err = nokey ? -ENOKEY : -EPERM; + goto err_out; } return d_splice_alias(inode, dentry); err_out: - iget_failed(inode); + iput(inode); return ERR_PTR(err); } |