Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757426AbcCaQRm (ORCPT ); Thu, 31 Mar 2016 12:17:42 -0400 Received: from mx2.suse.de ([195.135.220.15]:54228 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751511AbcCaQRk (ORCPT ); Thu, 31 Mar 2016 12:17:40 -0400 Subject: Re: [PATCH v3 1/2] scsi: Add intermediate STARGET_REMOVE state to scsi_target_state To: Johannes Thumshirn , "Martin K. Petersen" , "James E.J. Bottomley" References: <95ae7ee32dca23bb7f3ab432046fb7016b341049.1459428540.git.jthumshirn@suse.de> Cc: "Ewan D. Milne" , Christoph Hellwig , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org From: Hannes Reinecke Message-ID: <56FD4DA1.3000006@suse.de> Date: Thu, 31 Mar 2016 18:17:37 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.0 MIME-Version: 1.0 In-Reply-To: <95ae7ee32dca23bb7f3ab432046fb7016b341049.1459428540.git.jthumshirn@suse.de> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2540 Lines: 69 On 03/31/2016 02:53 PM, Johannes Thumshirn wrote: > Add intermediate STARGET_REMOVE state to scsi_target_state to avoid running > into the BUG_ON() in scsi_target_reap(). > > This intermediate state is only valid in the path from scsi_remove_target() to > scsi_target_destroy() indicating this target is going to be removed. > > Signed-off-by: Johannes Thumshirn > Fixes: 40998193560dab6c3ce8d25f4fa58a23e252ef38 > --- > drivers/scsi/scsi_scan.c | 2 ++ > drivers/scsi/scsi_sysfs.c | 2 ++ > include/scsi/scsi_device.h | 1 + > 3 files changed, 5 insertions(+) > > diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c > index 6a82066..63b8bca 100644 > --- a/drivers/scsi/scsi_scan.c > +++ b/drivers/scsi/scsi_scan.c > @@ -315,6 +315,8 @@ static void scsi_target_destroy(struct scsi_target *starget) > struct Scsi_Host *shost = dev_to_shost(dev->parent); > unsigned long flags; > > + BUG_ON(starget->state != STARGET_REMOVE && > + starget->state != STARGET_CREATED); > starget->state = STARGET_DEL; > transport_destroy_device(dev); > spin_lock_irqsave(shost->host_lock, flags); > diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c > index 00bc721..0df82e8 100644 > --- a/drivers/scsi/scsi_sysfs.c > +++ b/drivers/scsi/scsi_sysfs.c > @@ -1279,11 +1279,13 @@ restart: > spin_lock_irqsave(shost->host_lock, flags); > list_for_each_entry(starget, &shost->__targets, siblings) { > if (starget->state == STARGET_DEL || > + starget->state == STARGET_REMOVE || > starget == last_target) > continue; > if (starget->dev.parent == dev || &starget->dev == dev) { > kref_get(&starget->reap_ref); > last_target = starget; > + starget->state = STARGET_REMOVE; > spin_unlock_irqrestore(shost->host_lock, flags); > __scsi_remove_target(starget); > scsi_target_reap(starget); > diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h > index f63a167..2bffaa6 100644 > --- a/include/scsi/scsi_device.h > +++ b/include/scsi/scsi_device.h > @@ -240,6 +240,7 @@ scmd_printk(const char *, const struct scsi_cmnd *, const char *, ...); > enum scsi_target_state { > STARGET_CREATED = 1, > STARGET_RUNNING, > + STARGET_REMOVE, > STARGET_DEL, > }; > > Reviewed-by: Hannes Reinecke Cheers, Hannes -- Dr. Hannes Reinecke zSeries & Storage hare@suse.de +49 911 74053 688 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N?rnberg GF: J. Hawn, J. Guild, F. Imend?rffer, HRB 16746 (AG N?rnberg)