From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753515AbbFXOcj (ORCPT ); Wed, 24 Jun 2015 10:32:39 -0400 Received: from cantor2.suse.de ([195.135.220.15]:42506 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752765AbbFXOca (ORCPT ); Wed, 24 Jun 2015 10:32:30 -0400 Date: Wed, 24 Jun 2015 16:32:23 +0200 From: Johannes Thumshirn To: SF Markus Elfring Cc: Benny Halevy , Boaz Harrosh , "James E. J. Bottomley" , linux-scsi@vger.kernel.org, LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: Re: [PATCH] SCSI-OSD: Delete an unnecessary check before the function call "put_disk" Message-ID: <20150624143223.GA24848@c203.arch.suse.de> References: <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <546E238A.5050606@users.sourceforge.net> <558ABBC2.8080304@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <558ABBC2.8080304@users.sourceforge.net> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jun 24, 2015 at 04:16:34PM +0200, SF Markus Elfring wrote: > From: Markus Elfring > Date: Wed, 24 Jun 2015 16:06:21 +0200 > > The put_disk() 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/scsi/osd/osd_uld.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c > index 243eab3..e2075522 100644 > --- a/drivers/scsi/osd/osd_uld.c > +++ b/drivers/scsi/osd/osd_uld.c > @@ -407,9 +407,7 @@ static void __remove(struct device *dev) > > OSD_INFO("osd_remove %s\n", > oud->disk ? oud->disk->disk_name : NULL); > - > - if (oud->disk) > - put_disk(oud->disk); > + put_disk(oud->disk); > ida_remove(&osd_minor_ida, oud->minor); > > kfree(oud); > -- > 2.4.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-scsi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Reviewed-by: Johannes Thumshirn -- Johannes Thumshirn Storage jthumshirn@suse.de +49 911 74053 689 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton HRB 21284 (AG Nürnberg)