aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/lustre/lustre/llite/namei.c
diff options
context:
space:
mode:
authorJames Simmons <jsimmons@infradead.org>2016-10-27 18:11:36 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-30 10:56:14 -0400
commit330e2a0f5f9e7410d0937ed35ac34284da17f2e8 (patch)
tree786cea57bf5d731f087e4559085e6bdffc2ce6f8 /drivers/staging/lustre/lustre/llite/namei.c
parentstaging: lustre: osc: remove handling cl_avail_grant less than zero (diff)
downloadlinux-dev-330e2a0f5f9e7410d0937ed35ac34284da17f2e8.tar.xz
linux-dev-330e2a0f5f9e7410d0937ed35ac34284da17f2e8.zip
staging: lustre: llite: remove IS_ERR(master_inode) check
The kernel function ilookup5_nowait never returns IS_ERR so we can remove the IS_ERR check in the ll_md_blocking_ast() function. Signed-off-by: James Simmons <uja.ornl@yahoo.com> Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-8697 Reviewed-on: http://review.whamcloud.com/23151 Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Frank Zago <fzago@cray.com> Reviewed-by: Andreas Dilger <andreas.dilger@intel.com> Reviewed-by: John L. Hammond <john.hammond@intel.com> Reviewed-by: Oleg Drokin <oleg.drokin@intel.com> Signed-off-by: James Simmons <jsimmons@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lustre/llite/namei.c')
-rw-r--r--drivers/staging/lustre/lustre/llite/namei.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c
index a69c8af7a567..9b4095f9b095 100644
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@ -283,7 +283,7 @@ int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
master_inode = ilookup5(inode->i_sb, hash,
ll_test_inode_by_fid,
(void *)&lli->lli_pfid);
- if (master_inode && !IS_ERR(master_inode)) {
+ if (master_inode) {
ll_invalidate_negative_children(master_inode);
iput(master_inode);
}