From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (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 4054E1624C5 for ; Mon, 23 Feb 2026 17:23:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771867428; cv=none; b=dToOkKXDlOQx3oKULGk5mT7/wUbRKek1uv9x9k4moJV6sffhTKrRUF1Ql2H1/yx0U0xZ4UszXT74D1wzXG3K+fymrT9VMC0IMsjspVKy2Y3smGxCOFY8hfIjRFL//6DLgRK8Eq4xtUbyrczSJ0XFCktkyqfi+bvrSqGKjpWUUnI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771867428; c=relaxed/simple; bh=HdKcWIRXvLVamXfF7ZeFDsbncN9MIo9MT+ODsJsfhJQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=T0cVwIcPuBsUDjIYnryUJ2+XoS0DuPOL4sxbNb+iHM7SRik3OpCbHDc361132dE2y8awD0a0nbZi+1ZRF3SO8trzJBpWhzrlW1NgkrR/5z7yB19CBYi2hgwX/9RUrffzW75Fzdna/PCxuxAn3PdMt5Nt5Qrk6umJ/ONbj/57dL8= 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=WhYq0RsR; arc=none smtp.client-ip=209.85.210.175 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="WhYq0RsR" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-8230d228372so2154878b3a.1 for ; Mon, 23 Feb 2026 09:23:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudlinux.com; s=google; t=1771867426; x=1772472226; 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=zYRTIPm2XKejelZxbfd12xi/Cr57PQ2HDO5pVWa4Q2s=; b=WhYq0RsRCnlbtAKr2ltNZSDCkeP14tGRpIL/sJXdbaFn0Dm7SYWC+2sJ1WG3FAvk3r ILHa97xtaZllAllCUpCzlCWhsDIzQTuN+s5j7oLGdi9YPfyI2VqnLBl1/WinK8Rs5PyD GEHQqpj0IUB7hksddWdEGldz3NetNbtvt+gHSiVQO7NsF99OW7cYNa3rzYFfKGsB6lX1 v6b8ou4OubnWs6oc9HWMsw3FxdmX9OpzG7/rCIL467mVdUhRqh3IJysjeSeo5N3YjKsq kwhpq2k6FnKtEHU8WSHVh9rI2r+zsELdS5FDgPJhJGfiSlNWdZiB8chZG7CFI/BXXFk3 3MKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771867426; x=1772472226; 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=zYRTIPm2XKejelZxbfd12xi/Cr57PQ2HDO5pVWa4Q2s=; b=j6ed1oGTzJkqOB23QxcNQrSHM8Kr9H0cu/kH2h7IAbPCBPYDrYaKsbjuu8SR2NfavD B/gYZ6QU+owE6a74DYj8+LzYWY18Ul5iZl6izMi2D9BMQ1gdCzaXnokgLEqA5YYn+CB7 1XXgyty+sBQT8vj4L18m1S6YnRXz7kyNa/efUyLLGhsn04Tmf6vElZjTWlxblYIxm7U+ ERcaIetOW6LY6B9vxwbQssdImyiy3R3Cuno6gqvzMI2vgsWk91ke8HAwfm5qbn1t/++t Xk0TmuNHh7MvcnqJeqntEwQBalw/GpiH2IQpPHgTKnnGbBn01bNrgSYUTE3ZkH3vUxHT Pq1w== X-Forwarded-Encrypted: i=1; AJvYcCXDsIncpvuVQ8P/73nfPZRg24dtEwx92SOcAeMIC3mxU74CvM43/McQ9yA/Sqcy6fBSx1M+BzqO+2XJYO0=@vger.kernel.org X-Gm-Message-State: AOJu0Yzf+h+6MElm1HWnKO/zygKRZI3ODg5EwXV242y+YKlHvLMAcLvy miWHOauWz9bEhOufGO4rC1Tl80+fSV/tnIBPSPG+2A56KCwRQ9Lkhkn4ohwLREAM5Ls= X-Gm-Gg: AZuq6aKOtWyDl26Ho2Mw+c4ouXByJVlucc29DOjqoJJo8icTeodS5g1VcMO5h+mbx2K BrgDGHY9N0Np/y0229RHsUqvyNR18iRt+YUDidrly5kkOlVU2VFfkwJMtXbuguRqFwljOBtHukD AZ2w7SShmvoprt9gfcb3VRHD82GiPikhmKPldLj1urEK/2PfihbMK6hBMVl5NDd/QfhyIvtNIgP PrnTO6gwx+JsaFt9+Do++1wYRWU7Bzp78dT3ubmcLVoo0EWmFXsZNxZ/Sue01Rl7zLrEsZXxrma 7sreGDUJulzJwCp4Q+4B+ocEqWjkknKB9qCVwW/JKsK/FEUclU9G+M+J/vLUsr9o74zQZJvyJny ZFtzHWOXl2sl0zOdmrtOoZJEkQ6IgsiwfTmlLxISV/p8RgJWBmPG5lSU2bgqwpapwV9gmpCeTYH Y5JHL85Q2uVbN+EYkoKkvkzZ3t/Wc7pXk= X-Received: by 2002:a05:6a00:2794:b0:81f:394a:4897 with SMTP id d2e1a72fcca58-826daa66f17mr8441167b3a.44.1771867426585; Mon, 23 Feb 2026 09:23:46 -0800 (PST) Received: from outpost.localdomain ([110.44.9.85]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-826dd641313sm7876162b3a.1.2026.02.23.09.23.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Feb 2026 09:23:46 -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.15.y 1/2] Revert "nvme: nvme-fc: Ensure ->ioerr_work is cancelled in nvme_fc_delete_ctrl()" Date: Mon, 23 Feb 2026 22:53:31 +0530 Message-Id: <20260223172332.291881-2-jsingh@cloudlinux.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260223172332.291881-1-jsingh@cloudlinux.com> References: <20260223172332.291881-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 60ba31330faf5677e2eebef7eac62ea9e42a200d. 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 ac1e4482011e..a959b2c9ae38 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -3263,6 +3263,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 @@ -3333,7 +3334,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