From patchwork Mon May 2 21:38:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 12834796 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5AADC433EF for ; Mon, 2 May 2022 21:39:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1387778AbiEBVnB (ORCPT ); Mon, 2 May 2022 17:43:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1387743AbiEBVmU (ORCPT ); Mon, 2 May 2022 17:42:20 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 868FFE0F5 for ; Mon, 2 May 2022 14:38:39 -0700 (PDT) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 556811F8AF; Mon, 2 May 2022 21:38:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1651527513; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3eV+nAWpb1s6cucrrh1PALfsxGlRNCR2IXlROmBUhDI=; b=MuW8Ub0Rx5sCEk/V3Pfqi7Lx4GJy94F8kFhCSO2I0PQHWxLvjBEOFNuu8VkUglLw6Wcu30 1oKVTDMDdMUf+H+Xk/QoIUU1O+xaGRYeJobelPrEdHZyl4v16DC9+0I4xAMvyQ/xrM+wQ2 KRF/yX+RjQaZD9UZrcvTyUruBKMyBQg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1651527513; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3eV+nAWpb1s6cucrrh1PALfsxGlRNCR2IXlROmBUhDI=; b=dBzmrQloOHid3OvRJJELaw8vxRMUHPDqy4alS5W3ZS4GnejJimZ/oil5qy4kCB1lPgiESZ rTA7dA6JbSEMQ6Cg== Received: from adalid.arch.suse.de (adalid.arch.suse.de [10.161.8.13]) by relay2.suse.de (Postfix) with ESMTP id 21D8D2C16B; Mon, 2 May 2022 21:38:33 +0000 (UTC) Received: by adalid.arch.suse.de (Postfix, from userid 16045) id 1EE3F519411E; Mon, 2 May 2022 23:38:33 +0200 (CEST) From: Hannes Reinecke To: "Martin K. Petersen" Cc: Christoph Hellwig , James Bottomley , linux-scsi@vger.kernel.org, Hannes Reinecke , Hannes Reinecke , Adaptec OEM Raid Solutions Subject: [PATCH 21/24] ips: Do not try to abort command from host reset Date: Mon, 2 May 2022 23:38:17 +0200 Message-Id: <20220502213820.3187-22-hare@suse.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20220502213820.3187-1-hare@suse.de> References: <20220502213820.3187-1-hare@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org The code for aborting an outstanding command is a copy of the functionality from command abort. As we already have called this function once we reach host reset there's no point in trying to do so again. Signed-off-by: Hannes Reinecke Cc: Adaptec OEM Raid Solutions Reviewed-by: Christoph Hellwig Reviewed-by: Johannes Thumshirn --- drivers/scsi/ips.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index 16419aeec02d..d49c1d6df5d6 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c @@ -835,7 +835,6 @@ static int __ips_eh_reset(struct scsi_cmnd *SC) int i; ips_ha_t *ha; ips_scb_t *scb; - ips_copp_wait_item_t *item; METHOD_TRACE("ips_eh_reset", 1); @@ -860,23 +859,6 @@ static int __ips_eh_reset(struct scsi_cmnd *SC) if (!ha->active) return (FAILED); - /* See if the command is on the copp queue */ - item = ha->copp_waitlist.head; - while ((item) && (item->scsi_cmd != SC)) - item = item->next; - - if (item) { - /* Found it */ - ips_removeq_copp(&ha->copp_waitlist, item); - return (SUCCESS); - } - - /* See if the command is on the wait queue */ - if (ips_removeq_wait(&ha->scb_waitlist, SC)) { - /* command not sent yet */ - return (SUCCESS); - } - /* An explanation for the casual observer: */ /* Part of the function of a RAID controller is automatic error */ /* detection and recovery. As such, the only problem that physically */