Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1355151

[PATCH] f2fs: fix to avoid unneeded unlock_new_inode

Show all headers | View raw

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>
---
 fs/f2fs/namei.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index 7b07a47..7876f10 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);
 }

-- 
2.7.2

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] f2fs: fix to avoid unneeded unlock_new_inode Chao Yu <chao@kernel.org> - 2016-03-10 15:30 +0100

csiph-web