From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 69C6633121C for ; Mon, 23 Feb 2026 17:22:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771867379; cv=none; b=O6EKWkmpBTULDu75YnfgUIr79QmBsoh3OzR+SyJTo57R3069kkwOChYCNBHY5TJgcCofATs8aI/84BRIV/GVEGaz5+pE1INBzbV2IaIpBwzgFPjBRKmYQf+SiEAZQmpnwFbfMoAJZfEDGktnWNkik2UsKfUF1XhF4akPeeryQtQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771867379; c=relaxed/simple; bh=U70+ueZQcya+AMyyGEdTupohSZkBEKgjmtTXFJMPNao=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=I6oTFr+NjnGyS5V8r3wMdaWoIv/9dOvrDsZwF23s1A2wbvL7WU0K6zJJpYHI5Aizd0qTPhf9zNc6u6nKuWoTjYmWVvlLayXgUcPovwZ6WieWSin+INraDCwPBFNKON9hXvZvj/5xUSOe/zvylLS/yq07LvbqOezLNneht5ulwI8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=cloudlinux.com; spf=pass smtp.mailfrom=cloudlinux.com; dkim=pass (2048-bit key) header.d=cloudlinux.com header.i=@cloudlinux.com header.b=N8qT1TaI; arc=none smtp.client-ip=209.85.215.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=cloudlinux.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cloudlinux.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cloudlinux.com header.i=@cloudlinux.com header.b="N8qT1TaI" Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-c70942441ebso3013241a12.1 for ; Mon, 23 Feb 2026 09:22:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudlinux.com; s=google; t=1771867378; x=1772472178; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P90vw/KWtem1WCNNgNpg1BwJkR7vXWZPVCTvb7IRCEA=; b=N8qT1TaI0ZdYlAiPqbnj3m11Wd1+ny71R5ijsoKD+xcUFABc3cm9/beDOG90kpe8iA jobVW5dH0kWzTYUstJUdQISgbt+vYKjvWEFwtfpjRLjszHroY1FtddUlfXpUfR0uLbFt QNqQ307QxOy32yxeczNTCWTj09ROYg9QCXPTn28wSPoJZ6aZLLUCemhvDgq2Ol0DnN4N dCqCWBtwtOHYsywxGt5quHLg8rEgYee3iXQTdecFZaEgDaiDQNLLc7J5Gvh3dRxqDWul 5Vry9+fht297QH+BFCtQGmzCYYX5797/ejAWqMxAxDoYDvJEtCqiiY2HBVTwBtWBnuKD BJSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771867378; x=1772472178; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=P90vw/KWtem1WCNNgNpg1BwJkR7vXWZPVCTvb7IRCEA=; b=Z1MrVfLZgmhAK3Cyc68YLFqqPXVDEOGlqG8Lo8PrbHI/KliIBeWjSqc1CvzJhaFmcW sqrksAqFamhT3IK8sahEAqVJvapj27qEQv2q0pld2qkoKH9/oaxU7M61eUwoGhyY+7oI cOgwkJvy+qedqhDu7zcqaYd+QHjQlS9wo0becHITnBSlk5/aBzeNSitcqUN/jKbjdAWd lEGBtbHCZAdiYCGgqLmvPcWyPwwBzt3vaBW1AfOOKgwzLk1V1WrFFq/42F8K78ky4spN /+jaeZhxwm9ijHsoZaNwjGw8b5ux/2tsT51Wwu9Y0S5r2grl55D/xlU23O9arWNM2f5N y9Cg== X-Forwarded-Encrypted: i=1; AJvYcCUHQ6YrNC6bNbFrW5m5LSfxQkjY3C9lVGPrxEnsDtrvvAfK/mDCGshADaZSujjgVAxTGLS7XmCOqW0yf5w=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5rfQSCHAuX73YTi3aK0Al7iuTy3JFe/8nmTq5OSiuRlXP5kQp JMLHKbJWfC/PaueosiZKAKzNf+wrrFQcbfdM4OOzxCjPHmeSkFqYnGs3Cqg/hflCKPI= X-Gm-Gg: AZuq6aKFigE4i+bYxAoSlTidN4B7Gio92jXdHO4tR5Z//g754r+7dePHhatSWYUsKpo +Q1OO0mNTlqvPxk1zqHsvF81MyKsAlfSyom0PRRlKeZ4XE8qs8KBkZAdrSPjfDBxFgaCGMMSX2H USV4umvRpH4i7nOokVwt+jAn/6R77RY77Dc7RQ0873v9inQWI/80l/ZKXpRvPlQmXpzHHfmLPs/ 2407ZeZZSx7VPMWx28n6mAV3TyKCpMBEcicM68ib81hl3BhQgs4cJBF6gZdw+p5SDg4Ha38esDr O3jeNK4Ha0AYsbHQhiPlS/eFSaSuiiWLuIqOt8AkSD54G1SF2dvleWed7frgn29XAllJP8JUBGf GHIrfnfSh5koTYPm479VcAQMo0fSEtG2TNqZkqR+/9gq0A7oaVEbnZxmB8fo0/e87qECfWy7huD twGSnUVL76iDyjUDXKPFDIZQHz6NAoi/U= X-Received: by 2002:a05:6a20:1595:b0:393:73e5:7404 with SMTP id adf61e73a8af0-39545f88f2bmr8621279637.52.1771867377615; Mon, 23 Feb 2026 09:22:57 -0800 (PST) Received: from outpost.localdomain ([110.44.9.85]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c70b7269771sm7942918a12.30.2026.02.23.09.22.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Feb 2026 09:22:57 -0800 (PST) From: Jaskaran Singh To: stable@vger.kernel.org, james.smart@broadcom.com, kbusch@kernel.org, axboe@fb.com, hch@lst.de, sagi@grimberg.me Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, Jaskaran Singh Subject: [PATCH 5.10.y 1/2] Revert "nvme: nvme-fc: Ensure ->ioerr_work is cancelled in nvme_fc_delete_ctrl()" Date: Mon, 23 Feb 2026 22:52:40 +0530 Message-Id: <20260223172241.291649-2-jsingh@cloudlinux.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260223172241.291649-1-jsingh@cloudlinux.com> References: <20260223172241.291649-1-jsingh@cloudlinux.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This reverts commit 3d78e8e01251da032a5f7cbc9728e4ab1a5a5464. The backport of upstream commit 0a2c5495b6d1 was incorrectly applied. The cancel_work_sync() call for ->ioerr_work was added to nvme_fc_reset_ctrl_work() instead of nvme_fc_delete_ctrl(). Revert this commit so the correct fix can be applied. Signed-off-by: Jaskaran Singh --- 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 db905c30fbc6..31a9ae0eb2a7 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -3259,6 +3259,7 @@ nvme_fc_delete_ctrl(struct nvme_ctrl *nctrl) { struct nvme_fc_ctrl *ctrl = to_fc_ctrl(nctrl); + cancel_work_sync(&ctrl->ioerr_work); cancel_delayed_work_sync(&ctrl->connect_work); /* * kill the association on the link side. this will block @@ -3322,7 +3323,6 @@ nvme_fc_reset_ctrl_work(struct work_struct *work) /* will block will waiting for io to terminate */ nvme_fc_delete_association(ctrl); - cancel_work_sync(&ctrl->ioerr_work); if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_CONNECTING)) dev_err(ctrl->ctrl.device, -- 2.43.7