From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Subject: [PATCH 1/2] block-rbd: Delete an unnecessary check before the function call "rbd_dev_destroy" Date: Mon, 23 Nov 2015 20:44:27 +0100 Message-ID: <56536C9B.5010109@users.sourceforge.net> 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> <56536BAD.4000309@users.sourceforge.net> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <56536BAD.4000309@users.sourceforge.net> Sender: kernel-janitors-owner@vger.kernel.org To: Alex Elder , Ilya Dryomov , Sage Weil , ceph-devel@vger.kernel.org Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall List-Id: ceph-devel.vger.kernel.org From: Markus Elfring Date: Mon, 23 Nov 2015 20:16:45 +0100 The rbd_dev_destroy() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 235708c..24a757e 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -5184,8 +5184,7 @@ static int rbd_dev_probe_parent(struct rbd_device *rbd_dev, int depth) out_err: rbd_dev_unparent(rbd_dev); - if (parent) - rbd_dev_destroy(parent); + rbd_dev_destroy(parent); return ret; } -- 2.6.3