Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752874AbaLAKYC (ORCPT ); Mon, 1 Dec 2014 05:24:02 -0500 Received: from mout.web.de ([212.227.17.12]:56803 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752596AbaLAKYA (ORCPT ); Mon, 1 Dec 2014 05:24:00 -0500 Message-ID: <547C41B7.1060604@users.sourceforge.net> Date: Mon, 01 Dec 2014 11:23:51 +0100 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Alex Elder , Sage Weil , Yehuda Sadeh , Ceph CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH 1/1] block-rbd: Delete a check before ceph_put_snap_context() 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> In-Reply-To: <5317A59D.4@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:1zjwxdxvDxuyePHHQ2jXsA2fofoMIgf8x8PQxIbcrL3WSwfdRPz mbiO5FDpsinBh9a1u5v6zr37U7+QBPXSGODex9xGySIjMTFCmmQL8WLgTvM3KuL/3ggJUxb f5ayq4Inm5hmTErH2Nhk08PMIqBfb6neD1WXZztxlmYU/fMfm0gctvTCa4mRD/b/SfBFrJ2 fCWVSGnuKs2cvhnTBU7zQ== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 1 Dec 2014 11:18:21 +0100 The ceph_put_snap_context() 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 27b71a0..3c34ab5 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3405,8 +3405,7 @@ err_rq: if (result) rbd_warn(rbd_dev, "%s %llx at %llx result %d", obj_op_name(op_type), length, offset, result); - if (snapc) - ceph_put_snap_context(snapc); + ceph_put_snap_context(snapc); blk_end_request_all(rq, result); } -- 2.1.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/