79 lines
2.8 KiB
Diff
79 lines
2.8 KiB
Diff
|
From: Jan Engelhardt <jengelh@inai.de>
|
||
|
|
Date: 2019-05-28 16:37:03.776407560 +0200
|
||
|
|
|
||
|
|
cmd->serial_number was removed in commit
|
||
|
|
52eaa798f4f4e983c711eaa1c13d8859a52946e8 and users were changed to
|
||
|
|
cmd->request->tag.
|
||
|
|
|
||
|
|
---
|
||
|
|
vhba.c | 14 +++++++-------
|
||
|
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
Index: vhba-module-20170610/vhba.c
|
||
|
|
===================================================================
|
||
|
|
--- vhba-module-20170610.orig/vhba.c
|
||
|
|
+++ vhba-module-20170610/vhba.c
|
||
|
|
@@ -445,7 +445,7 @@ static int vhba_queuecommand_lck (struct
|
||
|
|
struct vhba_device *vdev;
|
||
|
|
int retval;
|
||
|
|
|
||
|
|
- scmd_dbg(cmd, "queue %lu\n", cmd->serial_number);
|
||
|
|
+ scmd_dbg(cmd, "queue %lu\n", cmd->request->tag);
|
||
|
|
|
||
|
|
vdev = vhba_lookup_device(cmd->device->id);
|
||
|
|
if (!vdev) {
|
||
|
|
@@ -476,7 +476,7 @@ static int vhba_abort (struct scsi_cmnd
|
||
|
|
struct vhba_device *vdev;
|
||
|
|
int retval = SUCCESS;
|
||
|
|
|
||
|
|
- scmd_warn(cmd, "abort %lu\n", cmd->serial_number);
|
||
|
|
+ scmd_warn(cmd, "abort %lu\n", cmd->request->tag);
|
||
|
|
|
||
|
|
vdev = vhba_lookup_device(cmd->device->id);
|
||
|
|
if (vdev) {
|
||
|
|
@@ -508,7 +508,7 @@ static ssize_t do_request (struct scsi_c
|
||
|
|
ssize_t ret;
|
||
|
|
|
||
|
|
scmd_dbg(cmd, "request %lu, cdb 0x%x, bufflen %d, use_sg %d\n",
|
||
|
|
- cmd->serial_number, cmd->cmnd[0], scsi_bufflen(cmd), scsi_sg_count(cmd));
|
||
|
|
+ cmd->request->tag, cmd->cmnd[0], scsi_bufflen(cmd), scsi_sg_count(cmd));
|
||
|
|
|
||
|
|
ret = sizeof(vreq);
|
||
|
|
if (DATA_TO_DEVICE(cmd->sc_data_direction)) {
|
||
|
|
@@ -520,7 +520,7 @@ static ssize_t do_request (struct scsi_c
|
||
|
|
return -EIO;
|
||
|
|
}
|
||
|
|
|
||
|
|
- vreq.tag = cmd->serial_number;
|
||
|
|
+ vreq.tag = cmd->request->tag;
|
||
|
|
vreq.lun = cmd->device->lun;
|
||
|
|
memcpy(vreq.cdb, cmd->cmnd, MAX_COMMAND_SIZE);
|
||
|
|
vreq.cdb_len = cmd->cmd_len;
|
||
|
|
@@ -585,7 +585,7 @@ static ssize_t do_response (struct scsi_
|
||
|
|
ssize_t ret = 0;
|
||
|
|
|
||
|
|
scmd_dbg(cmd, "response %lu, status %x, data len %d, use_sg %d\n",
|
||
|
|
- cmd->serial_number, res->status, res->data_len, scsi_sg_count(cmd));
|
||
|
|
+ cmd->request->tag, res->status, res->data_len, scsi_sg_count(cmd));
|
||
|
|
|
||
|
|
if (res->status) {
|
||
|
|
unsigned char sense_stack[SCSI_SENSE_BUFFERSIZE];
|
||
|
|
@@ -695,7 +695,7 @@ static inline struct vhba_command *match
|
||
|
|
struct vhba_command *vcmd;
|
||
|
|
|
||
|
|
list_for_each_entry(vcmd, &vdev->cmd_list, entry) {
|
||
|
|
- if (vcmd->cmd->serial_number == tag) {
|
||
|
|
+ if (vcmd->cmd->request->tag == tag) {
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
@@ -931,7 +931,7 @@ static int vhba_ctl_release (struct inod
|
||
|
|
list_for_each_entry(vcmd, &vdev->cmd_list, entry) {
|
||
|
|
WARN_ON(vcmd->status == VHBA_REQ_READING || vcmd->status == VHBA_REQ_WRITING);
|
||
|
|
|
||
|
|
- scmd_warn(vcmd->cmd, "device released with command %lu\n", vcmd->cmd->serial_number);
|
||
|
|
+ scmd_warn(vcmd->cmd, "device released with command %lu\n", vcmd->cmd->request->tag);
|
||
|
|
vcmd->cmd->result = DID_NO_CONNECT << 16;
|
||
|
|
vcmd->cmd->scsi_done(vcmd->cmd);
|
||
|
|
|