summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleg Drokin <green@linuxhacker.ru>2016-03-02 13:25:39 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-02 23:23:00 (GMT)
commit4ae51a74f048c820ff85ff68cace8d73bc51b728 (patch)
treeaa6d73886c300ca9b971de5addddf69bbbbd163d
parent2faedcd5b3d0838e8a612e3f7fd70d84113360dd (diff)
downloadlinux-4ae51a74f048c820ff85ff68cace8d73bc51b728.tar.xz
staging/lustre: Unbreak ll_prep_inode iget result check
commit 020ecc6f3229 ("staging: lustre: llite: Remove IS_ERR tests") managed to break one of the converted checks by losing a dereference causing the condition to be wrong and hence leading to a crash later on in case of actual error. IS_ERR_OR_NULL(*inode) got converted into !inode. Signed-off-by: Oleg Drokin <green@linuxhacker.ru> CC: Amitoj Kaur Chawla <amitoj1606@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/lustre/lustre/llite/llite_lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c
index b2e8475..acdae25 100644
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@ -1972,7 +1972,7 @@ int ll_prep_inode(struct inode **inode, struct ptlrpc_request *req,
*inode = ll_iget(sb, cl_fid_build_ino(&md.body->fid1,
sbi->ll_flags & LL_SBI_32BIT_API),
&md);
- if (!inode) {
+ if (!*inode) {
#ifdef CONFIG_FS_POSIX_ACL
if (md.posix_acl) {
posix_acl_release(md.posix_acl);