]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: lustre: llite: remove IS_ERR(master_inode) check
authorJames Simmons <jsimmons@infradead.org>
Thu, 27 Oct 2016 22:11:36 +0000 (18:11 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 30 Oct 2016 14:56:14 +0000 (10:56 -0400)
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>
drivers/staging/lustre/lustre/llite/namei.c

index a69c8af7a56772f2977df2a12e23f0832d778288..9b4095f9b095e452fd551e13424d61829ffd66b1 100644 (file)
@@ -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);
                                }