From 84f6e2cd3db3ea29b23ae16d767573d5544d88bd Mon Sep 17 00:00:00 2001 From: James Simmons Date: Thu, 13 Oct 2016 18:32:51 -0400 Subject: [PATCH] LU-8697 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. Change-Id: I5e72a8f70857f178a2377e9db80b2e2139c56ec3 Signed-off-by: James Simmons Reviewed-on: http://review.whamcloud.com/23151 Tested-by: Jenkins Reviewed-by: Frank Zago Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: John L. Hammond Reviewed-by: Oleg Drokin --- lustre/llite/namei.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c index 0ad758e..b687d6e 100644 --- a/lustre/llite/namei.c +++ b/lustre/llite/namei.c @@ -331,8 +331,7 @@ int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc, master_inode = ilookup5_nowait(inode->i_sb, hash, ll_test_inode_by_fid, (void *)&lli->lli_pfid); - if (master_inode != NULL && - !IS_ERR(master_inode)) { + if (master_inode) { ll_invalidate_negative_children( master_inode); iput(master_inode); -- 1.8.3.1