From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964875AbcGZTAb (ORCPT ); Tue, 26 Jul 2016 15:00:31 -0400 Received: from mout.web.de ([212.227.15.4]:50771 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964839AbcGZTA1 (ORCPT ); Tue, 26 Jul 2016 15:00:27 -0400 Subject: [PATCH 02/12] staging: lustre: Delete unnecessary checks before the function call "kobject_put" To: devel@driverdev.osuosl.org, lustre-devel@lists.lustre.org, Andreas Dilger , Greg Kroah-Hartman , Oleg Drokin References: <566ABCD9.1060404@users.sourceforge.net> <566D7733.1030102@users.sourceforge.net> <56784D83.7080108@users.sourceforge.net> <56784F0C.6040007@users.sourceforge.net> <20151221234857.GA27079@kroah.com> <59d94e70-7476-728e-5f63-013557ec2db9@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Bhumika Goyal From: SF Markus Elfring Message-ID: <48f00283-1648-e3f5-a76c-1ced01a4f231@users.sourceforge.net> Date: Tue, 26 Jul 2016 21:00:15 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <59d94e70-7476-728e-5f63-013557ec2db9@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:XYCTAkg3edTsYr2fqUe2NFjWuVekzfjWSnDuL7c3ewWMnR2rDVb 4SFYAEdzbS9FxFaoI/LNpVg4doWwl+zJG5gLb7dnyc0qJViq2tGm9+ucIZkngMHftAzgeS6 MwKTJpwMYsWHIILb0SvAYuwtoTLJiHnYmFWVOTXrUskDOKyC0DQttoQze+AinXx3JY41vR5 l5wSlkcF9JTzxlS1MJY0g== X-UI-Out-Filterresults: notjunk:1;V01:K0:g/Y3CvsBP/g=:39Iz9s8itCIcGLREB/g1HO S5VnTWHNpIz/DPAqIaeehigE+MVj5Zc1JApfeHW4njwCmKCAHDxJIN4OTP3pmK1Fw4LBgMid/ 4Egc5+bk0UK9qDEDBmsVeFovJns68tUHgEBKIHaH56Ejw6qhM9Glx2tP1fVsj5O9qATTvIEyW p9hy44lVVRB0tL+qtau5+6w/Fy1bV4F2I9Kk8Fin/9Wkg4s6wk8nzkhhieNQz57sphMbIWtIp 02BsU0SRc33g92EXFuIsXO9mzTpqEUnJVozcJON42PaBZNNyd4tQqI6duw9PQ7oKoMwwAAJdc xVtuDgWUts8v4aXim9Fgy9SjpvqiqNc/V1FrSVE4FlyIVdSc/iqDL6kZsQiMxXa6sAb5GnrCU S9eUY/C4u3mco10tQ7SeksSG0Ryi3hDwyg0Iaa20Wo4CNv2CiGqmdYGg9G1UDLro3i5hTZw2g j9R0X+LY3xcPJp/TBDiTvnmvjJW+ChNGJBy+WEDVyNvJR0p17jVgtL6UZwK1bHehzApWSIyDG xxTwctVJG49MVl7cIyDn+OF2vhsys4fe6aw1S6ojFZ6/ZfDA+9YK6ZK/b/MtnqF5I70n/EtYK 00wgTE07SMOND3M7/o7Yya3U9tK887ibLJmdL5BzfyHEEDLMdATGLvyiF8VVpOlhSmvn0fC/b FwwBnGv25iVmqVcYrei6gTE7JJHF/Qy7LMbhtR5CbSGtWqTiHnJbVnUDBOLAcM6XehfZweapT 9BTehTC5uK0AzJFcIXEaTM97x/scWtGXikWuGtNLrpT6uGoyhl3KC4sNmXco4wQNAP389TYzC F2Jm3UY Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 26 Jul 2016 13:00:32 +0200 The kobject_put() function tests whether its argument is NULL and then returns immediately. Thus the test around the calls is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 4 +--- drivers/staging/lustre/lustre/lmv/lmv_obd.c | 5 ++--- drivers/staging/lustre/lustre/lov/lov_obd.c | 4 +--- drivers/staging/lustre/lustre/obdclass/genops.c | 6 ++---- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c index 2c1c2fc..52c5dd4 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c @@ -1069,9 +1069,7 @@ static int ldlm_cleanup(void) kset_unregister(ldlm_ns_kset); kset_unregister(ldlm_svc_kset); - if (ldlm_kobj) - kobject_put(ldlm_kobj); - + kobject_put(ldlm_kobj); ldlm_debugfs_cleanup(); kfree(ldlm_state); diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c b/drivers/staging/lustre/lustre/lmv/lmv_obd.c index 0e1588a..8c2e5b3 100644 --- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c +++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c @@ -238,7 +238,7 @@ static int lmv_connect(const struct lu_env *env, if (data && data->ocd_connect_flags & OBD_CONNECT_REAL) rc = lmv_check_connect(obd); - if (rc && lmv->lmv_tgts_kobj) + if (rc) kobject_put(lmv->lmv_tgts_kobj); return rc; @@ -648,8 +648,7 @@ static int lmv_disconnect(struct obd_export *exp) lmv_disconnect_mdc(obd, lmv->tgts[i]); } - if (lmv->lmv_tgts_kobj) - kobject_put(lmv->lmv_tgts_kobj); + kobject_put(lmv->lmv_tgts_kobj); out_local: /* diff --git a/drivers/staging/lustre/lustre/lov/lov_obd.c b/drivers/staging/lustre/lustre/lov/lov_obd.c index 9b92d55..df701f7 100644 --- a/drivers/staging/lustre/lustre/lov/lov_obd.c +++ b/drivers/staging/lustre/lustre/lov/lov_obd.c @@ -106,9 +106,7 @@ static void lov_putref(struct obd_device *obd) __lov_del_obd(obd, tgt); } - if (lov->lov_tgts_kobj) - kobject_put(lov->lov_tgts_kobj); - + kobject_put(lov->lov_tgts_kobj); } else { mutex_unlock(&lov->lov_lock); } diff --git a/drivers/staging/lustre/lustre/obdclass/genops.c b/drivers/staging/lustre/lustre/obdclass/genops.c index 99c2da6..1b5aa9b 100644 --- a/drivers/staging/lustre/lustre/obdclass/genops.c +++ b/drivers/staging/lustre/lustre/obdclass/genops.c @@ -203,8 +203,7 @@ int class_register_type(struct obd_ops *dt_ops, struct md_ops *md_ops, return 0; failed: - if (type->typ_kobj) - kobject_put(type->typ_kobj); + kobject_put(type->typ_kobj); kfree(type->typ_name); kfree(type->typ_md_ops); kfree(type->typ_dt_ops); @@ -231,8 +230,7 @@ int class_unregister_type(const char *name) return -EBUSY; } - if (type->typ_kobj) - kobject_put(type->typ_kobj); + kobject_put(type->typ_kobj); if (!IS_ERR_OR_NULL(type->typ_debugfs_entry)) ldebugfs_remove(&type->typ_debugfs_entry); -- 2.9.2