summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-12-05 18:23:48 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2015-12-06 21:18:04 -0500
commit0e81ba231239b58c8b17dca18c6345c13e793824 (patch)
treeabcb8705280530c2799d40bc18a7a4b5d3ac136e
parent886f56f970f9c1563503cd71a572ba082b6a035b (diff)
downloadlinux-stable-0e81ba231239b58c8b17dca18c6345c13e793824.tar.gz
linux-stable-0e81ba231239b58c8b17dca18c6345c13e793824.tar.bz2
linux-stable-0e81ba231239b58c8b17dca18c6345c13e793824.zip
don't opencode iget_failed()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--drivers/staging/lustre/lustre/llite/namei.c4
-rw-r--r--fs/ecryptfs/inode.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c
index 2ca22001a534..64db5e86672f 100644
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@ -126,9 +126,7 @@ struct inode *ll_iget(struct super_block *sb, ino_t hash,
rc = cl_file_inode_init(inode, md);
}
if (rc != 0) {
- make_bad_inode(inode);
- unlock_new_inode(inode);
- iput(inode);
+ iget_failed(inode);
inode = ERR_PTR(rc);
} else
unlock_new_inode(inode);
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index e2e47ba5d313..92c5dae576b1 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -282,9 +282,7 @@ ecryptfs_create(struct inode *directory_inode, struct dentry *ecryptfs_dentry,
if (rc) {
ecryptfs_do_unlink(directory_inode, ecryptfs_dentry,
ecryptfs_inode);
- make_bad_inode(ecryptfs_inode);
- unlock_new_inode(ecryptfs_inode);
- iput(ecryptfs_inode);
+ iget_failed(ecryptfs_inode);
goto out;
}
unlock_new_inode(ecryptfs_inode);