From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) (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 5327C1D63F3 for ; Mon, 23 Feb 2026 17:24:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771867458; cv=none; b=YaLtMNOSKRZ8NBGYLV3YnhA3C1yEJpiSyqa/f3z1ojhefRHwIyhwM11sXlCie6MT4zr7OO/ByqTRgK6REmYQ8/IO/ZR0lPhFMcL6E2486XqZgFLLN+qtUWH+Qa+ycp7btDDl+o7qwKsxR+H7aURXCTbffTkuhj/TJMvTwaSWl/E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771867458; c=relaxed/simple; bh=Efzx66bRigpP2u+X3GHlHWuzfR2ABiVPc991fIPA9kc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DcOVHClcsUdu6HHZBiGRjALor2GWwUsc3Gb8dxNloRRcqY7snxYmE28NdchY6MoBoMjqpZ+X5WB0/SzJX5ls59dapTQ6jLs/YWCf20MpYmSOO717YN78tcOIo2LDhEjzXvPYy68CsuSPGBir0wOzDm2M/Y+Na2eA8kzIM7xewaA= 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=hCwTYxPo; arc=none smtp.client-ip=209.85.215.176 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="hCwTYxPo" Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-c6de0527ce1so2596479a12.2 for ; Mon, 23 Feb 2026 09:24:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudlinux.com; s=google; t=1771867457; x=1772472257; 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=WNHyGNAyEqFR3uHLeuiUimMy9GKVCPy3eo7HwiOI0Rs=; b=hCwTYxPowag1s53MVwsMiu5M5sb4GbCw/PtfxUwRMEOF2c4n/NY79v+SSDasyXdqk8 cJ4JB/ZL7g7HmPia+T0xF9bfffbJTNOiPMzf+gZVEPF2hBi+IiooNl2YUVLtjMCVEiEB AzYd3NYBLXBB4ouBAt83cy910CunryqJ4CI8FROejyZFrtudWQrZMTnNYD5lRNI703Zg +lPz1cA781XZRu8mibMhUx1ujjHgXXy9MfnQd0ola4JZqfUjPkyakvjubX91aQezrhxp qbeWcfgoHvTZwTyo1Y+1nbmD9ymmQUU47Eku4odgdC42RYg5UOs4GVGXUQRusChmYhsG YUaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771867457; x=1772472257; 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=WNHyGNAyEqFR3uHLeuiUimMy9GKVCPy3eo7HwiOI0Rs=; b=AegBqvjKNM9qQMwXGIbve/LDwnGB94eLKy3C4bz1b64Df60k4rkN5+DKWFN7McH46S 67OJEJhJ2rZG0y4XTVTLRVgoI2OAvoAFoEOVX3uGLIgYNJN6lEBS82QzeqgE32d9VC2P 0aZ6RyCHx0U1Laq8BnF6ndqvOiY+vLBlidTMBO8uX5SVoHh0p916H5Xpm0yX26bONawY BVhQt6LZVexe7LMX87bN3s0ZPJAov5qwS87RQ82oq+qOFB9JrOxfceaRqeRJa5DB41o+ FXqQDt6kGaknjkiSi2JitaN46jyCcXCvQwzBwZ7jNtSgSfCMi1EY85fbHVI9UJ8+/SQj 78AA== X-Forwarded-Encrypted: i=1; AJvYcCVSHhkUjn7RYaCy4Qc6xJ8a1JX+rgZBMEf0knoXy3/T8bIkRQmJBdpQJSL3lGgY5Y7OXC/zqHJ3ShiRrn0=@vger.kernel.org X-Gm-Message-State: AOJu0YyUQyXesFkBXudEKZg7OiGHUPGDOTY3EIa0OHdIuS2Dgg6m7NXt JwgCf0+7PLCVrY/SUKsj24eSxU1vFYTMY0+f5BChdkpzAOvZF2vy+3EQYE7OH8Fq88o= X-Gm-Gg: AZuq6aJH12U3hoIovvpHZleXaQP3nBhMM30k7mn+7O0k9vguMmiTZJNpKsFU+nzbE0b aeiKe3SCNsb4sNBeUklEGQk1/JAZ9y0fw7G0w/NnacO9tW3BKuop72ZFqEUYXhB7EZE32Zf1JnM hgYDWZaV6GrJA+KxtOKhTEKVzsJFhQpZnOhbRkOC2mBekjmnQpASihgaAuz19rmq59gN5H4Cdb8 bPsuxqETAy7C3tnESpzcM7SnXOWEhDPKGbTU4V1vlJrHF4lrbzXczn2ZEWuPkrMAVwOoigoKMjY 7VU1UV3jmapcsARIw8tkWp3WXI1KW2ejullBMb4IOnBNfe+n/Xrs5JfW3i/0PFjmgGZaVuvx70s kIXwEyFntdjm8I2FUbDwfTL/dwDWPMFKUKQl6e6bq6EuzWyiuqAqBRVemuG+5qbPSg4Btw58ase DgoE9V2M2fVsSdGrhXfPIiez5u124J6Y4= X-Received: by 2002:a05:6a20:d43:b0:393:5fcd:cec5 with SMTP id adf61e73a8af0-39545f7b08emr6929576637.58.1771867456515; Mon, 23 Feb 2026 09:24:16 -0800 (PST) Received: from outpost.localdomain ([110.44.9.85]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c70b724321esm7802332a12.16.2026.02.23.09.24.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Feb 2026 09:24:16 -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 6.1.y 1/2] Revert "nvme: nvme-fc: Ensure ->ioerr_work is cancelled in nvme_fc_delete_ctrl()" Date: Mon, 23 Feb 2026 22:54:04 +0530 Message-Id: <20260223172405.292040-2-jsingh@cloudlinux.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260223172405.292040-1-jsingh@cloudlinux.com> References: <20260223172405.292040-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 3d81beae4753db3b3dc5b70dc300d4036e0d9cb8. 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(). 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 63bef22095b4..9b5976c80803 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -3264,6 +3264,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 @@ -3334,7 +3335,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