From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC39BC432C3 for ; Tue, 19 Nov 2019 06:01:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B951E206DA for ; Tue, 19 Nov 2019 06:01:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574143310; bh=ISeaOKmHnavx9pYDCueLskqxWV5BjW6cNJIyazddgCs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hB7MznxeSc3BmI+YEJd23I5wM3yHskKPU76nmiTdy7ti6r/tI8FtK4PyeFk3unqpH qKrhEadC0P4DPlpcRw8vIF76UkUKwFsy4btIXTnCUlajfR38nA9Ayg4Wrvlp6lfmEh Mc93wL7K2Pnb1oBDDcMUvqeVRtCsM2VZGd9K8Uk0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728472AbfKSGBt (ORCPT ); Tue, 19 Nov 2019 01:01:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:38180 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730512AbfKSFnU (ORCPT ); Tue, 19 Nov 2019 00:43:20 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7ED6A21783; Tue, 19 Nov 2019 05:43:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142200; bh=ISeaOKmHnavx9pYDCueLskqxWV5BjW6cNJIyazddgCs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rjUAU4HXeSA1el5IjIFYI9HX191y9yVZJZaio0RiLFLZIkszEWcpJxAynm+x2Oqem u3lpfyqHFjgT4CczTPz/Nr00s4Tl+3qfbZqmpN1w0eqbqjQrbDmBONg9lUvG/Q2FLF rqf5ziy1hEh9N18DPxQegsbz8cdCUqbSjMVYiwec= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hannes Reinecke , Johannes Thumshirn , Ondrey Zary , Finn Thain , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.19 399/422] scsi: NCR5380: Clear all unissued commands on host reset Date: Tue, 19 Nov 2019 06:19:56 +0100 Message-Id: <20191119051424.993429022@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hannes Reinecke [ Upstream commit 1aeeeed7f03c576f096eede7b0384f99a98f588c ] When doing a host reset we should be clearing all outstanding commands, not just the command triggering the reset. [mkp: adjusted Hannes' SoB address] Signed-off-by: Hannes Reinecke Reviewed-by: Johannes Thumshirn Cc: Ondrey Zary Signed-off-by: Finn Thain Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/NCR5380.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index 5160d6214a36b..d0bbb20518048 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c @@ -2303,7 +2303,7 @@ static int NCR5380_host_reset(struct scsi_cmnd *cmd) spin_lock_irqsave(&hostdata->lock, flags); #if (NDEBUG & NDEBUG_ANY) - scmd_printk(KERN_INFO, cmd, __func__); + shost_printk(KERN_INFO, instance, __func__); #endif NCR5380_dprint(NDEBUG_ANY, instance); NCR5380_dprint_phase(NDEBUG_ANY, instance); @@ -2321,10 +2321,13 @@ static int NCR5380_host_reset(struct scsi_cmnd *cmd) * commands! */ - if (list_del_cmd(&hostdata->unissued, cmd)) { + list_for_each_entry(ncmd, &hostdata->unissued, list) { + struct scsi_cmnd *cmd = NCR5380_to_scmd(ncmd); + cmd->result = DID_RESET << 16; cmd->scsi_done(cmd); } + INIT_LIST_HEAD(&hostdata->unissued); if (hostdata->selecting) { hostdata->selecting->result = DID_RESET << 16; -- 2.20.1