From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754063AbbJNOTU (ORCPT ); Wed, 14 Oct 2015 10:19:20 -0400 Received: from mx2.suse.de ([195.135.220.15]:58136 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753480AbbJNOTR (ORCPT ); Wed, 14 Oct 2015 10:19:17 -0400 Message-ID: <561E6464.2020702@suse.de> Date: Wed, 14 Oct 2015 16:19:16 +0200 From: Hannes Reinecke User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Johannes Thumshirn , "James E.J. Bottomley" , Christoph Hellwig CC: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/3] SCSI: Rework list handling in __scsi_target_remove References: <1cfe37e6cb89ede18c88e60578d4293a6eb7430b.1444829611.git.jthumshirn@suse.de> In-Reply-To: <1cfe37e6cb89ede18c88e60578d4293a6eb7430b.1444829611.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 On 10/14/2015 03:50 PM, Johannes Thumshirn wrote: > Rework the list handling in __scsi_target_remove(). The new version introduces > a reap list for devices. Devices that shall be removed are placed on the reap > list and can then be removed later on. > > Signed-off-by: Johannes Thumshirn > --- > drivers/scsi/scsi_sysfs.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c > index b41dcb3..2bd88c6 100644 > --- a/drivers/scsi/scsi_sysfs.c > +++ b/drivers/scsi/scsi_sysfs.c > @@ -1129,20 +1129,24 @@ static void __scsi_remove_target(struct scsi_target *starget) > { > struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); > unsigned long flags; > - struct scsi_device *sdev; > + struct scsi_device *sdev, *tmp; > + LIST_HEAD(reap_list); > > spin_lock_irqsave(&shost->device_lock, flags); > restart: > - list_for_each_entry(sdev, &shost->__devices, siblings) { > + list_for_each_entry_safe(sdev, tmp, &shost->__devices, siblings) { > if (sdev->channel != starget->channel || > sdev->id != starget->id || > scsi_device_get(sdev)) > continue; > - scsi_remove_device(sdev); > + list_move_tail(&sdev->siblings, &reap_list); > scsi_device_put(sdev); > goto restart; > } > spin_unlock_irqrestore(&shost->device_lock, flags); > + > + list_for_each_entry_safe(sdev, tmp, &reap_list, siblings) > + scsi_remove_device(sdev); > } > > /** > Reviewed-by: Hannes Reinecke Cheers, Hannes -- Dr. Hannes Reinecke zSeries & Storage hare@suse.de +49 911 74053 688 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)