From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD16B13FE2; Thu, 11 Jan 2024 09:53:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="DseH/l62" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17768C43390; Thu, 11 Jan 2024 09:53:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1704966788; bh=OYrZmDL+eqaIXGpUGWBGllwky8lW4k9HOZSVrEO/vfs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DseH/l62ikep0KCFtquaJLGqRtnhvFpTn/Awc0867shHFwpPZ/46epn+CukZc/lCe NCjcWFbtnxVugxxoKxu4gS/hZjLN86xqiztdGfl7VjtDv9gIXfw4s2kOG59uhxDXCm kFHR+DBzYEyfYp5z+w0zQytN/pX9Ynsob7WFLXwQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pavel Machek , "Martin K. Petersen" , Ming Lei , Sasha Levin Subject: [PATCH 5.10 1/7] Revert "scsi: core: Always send batch on reset or error handling command" Date: Thu, 11 Jan 2024 10:52:50 +0100 Message-ID: <20240111094700.291427808@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240111094700.222742213@linuxfoundation.org> References: <20240111094700.222742213@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg Kroah-Hartman This reverts commit 9db5239d7533c841dcd7a36700f829f6ee96a76d which is commit 066c5b46b6eaf2f13f80c19500dbb3b84baabb33 upstream. As reported, a lot of scsi changes were made just to resolve a 2 line patch, so let's revert them all and then manually fix up the 2 line fixup so that things are simpler and potential abi changes are not an issue. Link: https://lore.kernel.org/r/ZZ042FejzwMM5vDW@duo.ucw.cz Reported-by: Pavel Machek Cc: "Martin K. Petersen" Cc: Ming Lei Cc: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/scsi_error.c | 2 -- 1 file changed, 2 deletions(-) --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -1068,7 +1068,6 @@ retry: scsi_log_send(scmd); scmd->submitter = SUBMITTED_BY_SCSI_ERROR_HANDLER; - scmd->flags |= SCMD_LAST; /* * Lock sdev->state_mutex to avoid that scsi_device_quiesce() can @@ -2360,7 +2359,6 @@ scsi_ioctl_reset(struct scsi_device *dev scmd->cmnd = scsi_req(rq)->cmd; scmd->submitter = SUBMITTED_BY_SCSI_RESET_IOCTL; - scmd->flags |= SCMD_LAST; memset(&scmd->sdb, 0, sizeof(scmd->sdb)); scmd->cmd_len = 0;