From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032694AbbKEMQQ (ORCPT ); Thu, 5 Nov 2015 07:16:16 -0500 Received: from mout.web.de ([212.227.15.14]:61502 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1032125AbbKEMQN (ORCPT ); Thu, 5 Nov 2015 07:16:13 -0500 Subject: [PATCH 1/3] staging: lustre: Delete unnecessary checks before two function calls To: Andreas Dilger , Greg Kroah-Hartman , Oleg Drokin , lustre-devel@lists.lustre.org, devel@driverdev.osuosl.org References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <563B473C.5090508@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <563B4878.7000106@users.sourceforge.net> Date: Thu, 5 Nov 2015 13:15:52 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <563B473C.5090508@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:OL5EJwbtIR8C6SyNiaPAzO02ac1umMUds9YuekiHtRrMX+1sAoO TFgaV8B501SUIY0Qo21/TsZbOxwv769je9CYHNzt26ctmewwncRfVQDH+n+jflvbcoUupbP mw64m9OiZ1nUMSwU1S5+QW2DPQ+H0jd4viuujb49j5nNFVPFlpRyM/5CgCsfWnMJeOzdApJ q9qLJuWzDUmJYgSPbAZgQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:TESJkamcARs=:epeH2G2cFruYpARl595E3H xj2DpzOzRc2Sp+1fDEnnPXF/Z8CM0JiyuSwOsqVqzMsBKGGbGLVG7Yup0VfYmqXJmm5YrAj5C qBTLFp0R8b+bl2JzqOPirYRid16gsnUwgFcNm80y3YBMEdGdQ4D64SdtVBQyAEpjET5IBxQOw h5/vdMyY5JEYqMZBlU5yXob452h9y/i+9F1OM9XvmI3R26/Vl0/9bZNvMGbmVZWdalWZELt+0 yuRswpWNEs0w8dby0JQzYClFLun41fP1NT0+rv8TE7l6OHea/I6y4QEhnzeIOmulzAf2afhEA JRpDNWucKebpjS+vQX4qq9HKPjOFuZmBPtNFDF0z+CBuASK2dnulYgsmJbhs9VXlfiAiy/qll H5CyU703BqiUQfW4Yb2AY92SupxsdWdLVI62Qu/HHwVjuDaV0LlkRuTshEQPwkTSHHt7W/NRL ROHpipr7+/AYYKtZosZx6PI5xPd5vLtUcNFEYkZdYZ4DPaFHD9HQyVknn98Fhj1S67uo2fvNM iMXLCaGe9i5qydrPHhuMmwJZbdP94meQ3TaEgS3MJBtlPSxQoAa6B5Tmqx93YaJKs96IDT0bs qmAY9Zp2YxfMrJp4xePcXat2tESiSQQ8MbRXH3SDLZ0ybBPyEU1vJEyItSUPEgMTp+7NlJ8H1 HPp7ViJGUTsIt5JJkpk9kcWPCyXFhOBEbxfXGPni/8L69nx7LBwPxD6NPtVyLAbL06e0Ja5l2 VyHILVAi8+LX26Oh7Fl3Ft+1HDuhSeyZbtJPblOZGZdjYziKd/ewWtGipPFxHsHYeQzUanOgg W2tECvH Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 5 Nov 2015 10:18:45 +0100 The functions kobject_put() and kset_unregister() test whether their argument is NULL and then return immediately. Thus the tests around their calls are not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 10 +++------- 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, 8 insertions(+), 17 deletions(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c index ca11511..e67e84b 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c @@ -1062,13 +1062,9 @@ static int ldlm_cleanup(void) if (ldlm_state->ldlm_cb_service != NULL) ptlrpc_unregister_service(ldlm_state->ldlm_cb_service); - if (ldlm_ns_kset) - kset_unregister(ldlm_ns_kset); - if (ldlm_svc_kset) - kset_unregister(ldlm_svc_kset); - if (ldlm_kobj) - kobject_put(ldlm_kobj); - + kset_unregister(ldlm_ns_kset); + kset_unregister(ldlm_svc_kset); + 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 635a93c..c3c8e8c 100644 --- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c +++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c @@ -240,7 +240,7 @@ static int lmv_connect(const struct lu_env *env, if (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; @@ -646,8 +646,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 7abe484..910c62c 100644 --- a/drivers/staging/lustre/lustre/lov/lov_obd.c +++ b/drivers/staging/lustre/lustre/lov/lov_obd.c @@ -109,9 +109,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 6477aeb..a1cf8e1 100644 --- a/drivers/staging/lustre/lustre/obdclass/genops.c +++ b/drivers/staging/lustre/lustre/obdclass/genops.c @@ -216,8 +216,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); @@ -244,8 +243,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.6.2