Unverified Commit 45c59d88 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4256 scsi: core: Always send batch on reset or error handling command 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Lingfeng <lilingfeng3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YRBQ6DY7O7EBDBGCBKP73SWKFFBTN4AI/ 
Always send batch on reset or error handling command.

Alexander Atanasov (2):
  scsi: core: Always send batch on reset or error handling command
  scsi: core: Always send batch on reset or error handling command

Bart Van Assche (3):
  scsi: core: Introduce scsi_get_sector()
  scsi: core: Use scsi_cmd_to_rq() instead of scsi_cmnd.request
  scsi: core: Use a structure member to track the SCSI command submitter

Greg Kroah-Hartman (6):
  Revert "scsi: core: Always send batch on reset or error handling
    command"
  Revert "scsi: core: Use a structure member to track the SCSI command
    submitter"
  Revert "scsi: core: Use scsi_cmd_to_rq() instead of scsi_cmnd.request"
  Revert "scsi: core: Make scsi_get_lba() return the LBA"
  Revert "scsi: core: Introduce scsi_get_sector()"
  Revert "scsi: core: Add scsi_prot_ref_tag() helper"

Martin K. Petersen (2):
  scsi: core: Add scsi_prot_ref_tag() helper
  scsi: core: Make scsi_get_lba() return the LBA


-- 
2.31.1
 
https://gitee.com/src-openeuler/kernel/issues/I8ZD3X 
 
Link:https://gitee.com/openeuler/kernel/pulls/4256

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 260c7a58 f8b8bfcf

drivers/scsi/scsi_error.c

+2 −0
Original line number Diff line number Diff line
@@ -1069,6 +1069,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd, 


	scsi_log_send(scmd);

	scmd->scsi_done = scsi_eh_done;

	scmd->flags |= SCMD_LAST;



	/*

	 * Lock sdev->state_mutex to avoid that scsi_device_quiesce() can
@@ -2361,6 +2362,7 @@ scsi_ioctl_reset(struct scsi_device *dev, int __user *arg) 
	scsi_init_command(dev, scmd);

	scmd->request = rq;

	scmd->cmnd = scsi_req(rq)->cmd;

	scmd->flags |= SCMD_LAST;



	scmd->scsi_done		= scsi_reset_provider_done_command;

	memset(&scmd->sdb, 0, sizeof(scmd->sdb));