From patchwork Thu May 12 11:12:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 571989 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 06F25C433EF for ; Thu, 12 May 2022 11:13:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353077AbiELLN1 (ORCPT ); Thu, 12 May 2022 07:13:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353016AbiELLM5 (ORCPT ); Thu, 12 May 2022 07:12:57 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C3B261620 for ; Thu, 12 May 2022 04:12:47 -0700 (PDT) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 4EE3921C73; Thu, 12 May 2022 11:12:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1652353966; 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=EHHWkdFLsSAFkAy9by9wkYrIAb1tj3q44mL+hQfWAkE=; b=jP5E+655pbiAbQ/1Kz8GBY9iFYCYkSOWZoXKd9CqscNe0OUeHK9N58AYmlqwKiDqY+7Kuc bcJ+u4BtWvBdG/hRHc+EfLdKUzvmjKoQ1bV8/FBLf9PKKWZTlQk+B8p2YFGExTdGHOGUwu Z/xvb6o4V5H2wQ5HnWmsHOC+K/sfOVQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1652353966; 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=EHHWkdFLsSAFkAy9by9wkYrIAb1tj3q44mL+hQfWAkE=; b=jBBfWaGE9VSpDLOhENmGun8wZ1g935A+DY5QzVFrvwJ+ORop//afqIn1PWFWInM4HL8Wuy oEl2UvzHob5YwyCg== Received: from adalid.arch.suse.de (adalid.arch.suse.de [10.161.8.13]) by relay2.suse.de (Postfix) with ESMTP id 027BC2C142; Thu, 12 May 2022 11:12:46 +0000 (UTC) Received: by adalid.arch.suse.de (Postfix, from userid 16045) id E635051943DC; Thu, 12 May 2022 13:12:45 +0200 (CEST) From: Hannes Reinecke To: "Martin K. Petersen" Cc: Christoph Hellwig , James Bottomley , linux-scsi@vger.kernel.org, Hannes Reinecke , Bart Van Assche , Johannes Thumshirn Subject: [PATCH 02/20] fc_fcp: use fc_block_rport() Date: Thu, 12 May 2022 13:12:18 +0200 Message-Id: <20220512111236.109851-3-hare@suse.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20220512111236.109851-1-hare@suse.de> References: <20220512111236.109851-1-hare@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Use fc_block_rport() instead of fc_block_scsi_eh() as the SCSI command will be removed as argument for SCSI EH functions. Signed-off-by: Hannes Reinecke Reviewed-by: Christoph Hellwig Reviewed-by: Bart Van Assche Reviewed-by: Johannes Thumshirn --- drivers/scsi/libfc/fc_fcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c index bce90eb56c9c..074996319df5 100644 --- a/drivers/scsi/libfc/fc_fcp.c +++ b/drivers/scsi/libfc/fc_fcp.c @@ -2157,7 +2157,7 @@ int fc_eh_device_reset(struct scsi_cmnd *sc_cmd) int rc = FAILED; int rval; - rval = fc_block_scsi_eh(sc_cmd); + rval = fc_block_rport(rport); if (rval) return rval;