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=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 2D3B5C433DB for ; Wed, 17 Mar 2021 00:57:30 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B339C64F8F for ; Wed, 17 Mar 2021 00:57:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B339C64F8F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mnhHvKlI+vfxAVEjGILObm9Qg7G9+31tW2NnCkmrEAY=; b=D2z6o1lDM4yrmKyFqMYWascYi ff0A10dUfOTap5hQ6kqdOdRMMfPZfMzj21GgJUikoNsUk7DK5OyDtWRqoidZxwL1237Z19SbwtJd4 Hh/CRlInglzz5UpIJXjV1c2K5mDApvxaIfVpUvnRzEmNLbkZmuc5wzI1DW+YpULbN0QGK9t2onUhz B2sjj4kmoUBKF/qi1LWutmcMBbkHNdJIv1XeIO3cGB147yidXN4jEnnU0uiHQANlESxOWc3wnmP0w qlxjva8xKXrnasRjxz2EeW6/OzqKSFXEDgxQyQxIEPhKmSIbBpx/yKbW2F32pJBZMULT0SvLZfB0+ qbt1DdZ6Q==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lMKV2-00271Q-VP; Wed, 17 Mar 2021 00:57:25 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lMKUM-0026ft-Af for linux-nvme@lists.infradead.org; Wed, 17 Mar 2021 00:56:45 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3FF8864F97; Wed, 17 Mar 2021 00:56:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615942601; bh=TB2G9h7TKrUOwzjOSiCb3bkl/tAilWqLR6IHXUsml1k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IIkYLtzgMRWu1iiJmg6LfuEt69i8zxNX+EMdXNRS79G+WfJscl6iX+WSTz/6O1/Kv 4yln8ulw6lntUZiLdeCMIUEG8rwfjC53oq3IuWyr532TX6FIM9PNn2SxKbffYpChH7 6Sq2MpwoVr5oNf2gsrrsbLXERKexp1S+osnhth+JUyZgfyUVzqiEfaEtJMM0ZOLXDB kyRPbWa9iPmaV+M3xODrKZADeQa8upw5XlK5wwcfZIClcZmBQiV6hmKf1Q8xnQcKFG bWF2EX/GBpmw8SlqsmhJqSpgMWZi4GQlPF+vH1I6kWfuBbMmBrapZLX/M5xQEO665c zDyVi5a6LHNgg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hannes Reinecke , Sagi Grimberg , James Smart , Daniel Wagner , Christoph Hellwig , Sasha Levin , linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 5.11 52/61] nvme-fc: return NVME_SC_HOST_ABORTED_CMD when a command has been aborted Date: Tue, 16 Mar 2021 20:55:26 -0400 Message-Id: <20210317005536.724046-52-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210317005536.724046-1-sashal@kernel.org> References: <20210317005536.724046-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210317_005643_375807_3302562B X-CRM114-Status: GOOD ( 10.39 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org From: Hannes Reinecke [ Upstream commit ae3afe6308b43bbf49953101d4ba2c1c481133a8 ] When a command has been aborted we should return NVME_SC_HOST_ABORTED_CMD to be consistent with the other transports. Signed-off-by: Hannes Reinecke Reviewed-by: Sagi Grimberg Reviewed-by: James Smart Reviewed-by: Daniel Wagner Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/host/fc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index cd2d28139d97..f737fc9aa5dd 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -1956,7 +1956,7 @@ nvme_fc_fcpio_done(struct nvmefc_fcp_req *req) sizeof(op->rsp_iu), DMA_FROM_DEVICE); if (opstate == FCPOP_STATE_ABORTED) - status = cpu_to_le16(NVME_SC_HOST_PATH_ERROR << 1); + status = cpu_to_le16(NVME_SC_HOST_ABORTED_CMD << 1); else if (freq->status) { status = cpu_to_le16(NVME_SC_HOST_PATH_ERROR << 1); dev_info(ctrl->ctrl.device, -- 2.30.1 _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme