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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CFCE9C7EE29 for ; Thu, 25 May 2023 18:48:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242118AbjEYSsS (ORCPT ); Thu, 25 May 2023 14:48:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242741AbjEYSpV (ORCPT ); Thu, 25 May 2023 14:45:21 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 660943ABF; Thu, 25 May 2023 11:41:29 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 56CC360B5E; Thu, 25 May 2023 18:40:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13140C433A7; Thu, 25 May 2023 18:40:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685040044; bh=olsUV6eDcmHnx/fL5hia89UDW05rIxgTusM4aF0wg/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MfqbUVb4Lz+9U97rNROl7OjNyO3dbuy4pBwUa7TOBy1pcKd7o8VXqthCf5h1deFDT uzLrUnFFGke3cb1PAfEdFgBY9NnGmMA2qP8xgMX7y1zkl69y6JDzkhoUOeE29QvdZ0 /EuoKC9YhIvTEpqB1vflDjjztKuofsPzc3Qso/Zg+5GdHycc+P0ctrP6QudWcSkguM JlP1rEjeglDLMsurRmYccd/JjPVZ3DW3aBZ7AYSvRhJ/HDBU3l3VJxG6KBW+zu48UD fS2ZmO197emCRwS7dhgFqpXYIdzBYQ76zMNe4IdqYr0NipT2VLDEoXemxALtoi5qhe mDTv6SFZr8Dvw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christoph Hellwig , Sagi Grimberg , Keith Busch , Sasha Levin , linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 5.15 37/43] nvme-multipath: don't call blk_mark_disk_dead in nvme_mpath_remove_disk Date: Thu, 25 May 2023 14:38:48 -0400 Message-Id: <20230525183854.1855431-37-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230525183854.1855431-1-sashal@kernel.org> References: <20230525183854.1855431-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christoph Hellwig [ Upstream commit 1743e5f6000901a11f4e1cd741bfa9136f3ec9b1 ] nvme_mpath_remove_disk is called after del_gendisk, at which point a blk_mark_disk_dead call doesn't make any sense. Signed-off-by: Christoph Hellwig Reviewed-by: Sagi Grimberg Signed-off-by: Keith Busch Signed-off-by: Sasha Levin --- drivers/nvme/host/multipath.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index 8d97b942de01f..73eddb67f0d24 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -821,7 +821,6 @@ void nvme_mpath_remove_disk(struct nvme_ns_head *head) { if (!head->disk) return; - blk_mark_disk_dead(head->disk); /* make sure all pending bios are cleaned up */ kblockd_schedule_work(&head->requeue_work); flush_work(&head->requeue_work); -- 2.39.2