mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-21 12:41:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2021-11-03 07:29:50 -07:00
parent e289587783 193e63d118
commit d327fe38e8
6 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qla2x00t-32gbit/Makefile
View File

@@ -50,7 +50,7 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
all:
$(MAKE) -C $(KDIR) M=$(shell pwd) \
$(shell [ -n "$(PASS_CC_TO_MAKE)" ] && echo CC="$(CC)") \
$(CONFIG_SCSI_QLA2XXX_TARGET)=CONFIG_SCSI_QLA2XXX_TARGET
CONFIG_SCSI_QLA2XXX_TARGET=$(CONFIG_SCSI_QLA2XXX_TARGET)
install: all
KDIR=$(KDIR) ../scripts/sign-modules

2
qla2x00t/Makefile
View File

@@ -48,7 +48,7 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
all:
$(MAKE) -C $(KDIR) M=$(shell pwd) \
$(shell [ -n "$(PASS_CC_TO_MAKE)" ] && echo CC="$(CC)") \
$(CONFIG_SCSI_QLA2XXX_TARGET)=CONFIG_SCSI_QLA2XXX_TARGET
CONFIG_SCSI_QLA2XXX_TARGET=$(CONFIG_SCSI_QLA2XXX_TARGET)
install: all
KDIR=$(KDIR) ../scripts/sign-modules

2
qla2x00t/qla_iocb.c
View File

@@ -1875,7 +1875,7 @@ static void qla25xx_set_que(srb_t *sp, struct rsp_que **rsp)
{
struct scsi_cmnd *cmd = GET_CMD_SP(sp);
struct qla_hw_data *ha = sp->fcport->vha->hw;
int affinity = scst_blk_rq_cpu(cmd->request);
int affinity = scst_blk_rq_cpu(scsi_cmd_to_rq(cmd));
if (ha->flags.cpu_affinity_enabled && affinity >= 0 &&
affinity < ha->max_rsp_queues - 1)

2
qla2x00t/qla_os.c
View File

@@ -1146,7 +1146,7 @@ __qla2xxx_eh_generic_reset(char *name, enum nexus_wait_type type,
}
err = 2;
if (do_reset(fcport, cmd->device->lun,
scst_blk_rq_cpu(cmd->request) + 1)
scst_blk_rq_cpu(scsi_cmd_to_rq(cmd)) + 1)
!= QLA_SUCCESS) {
ql_log(ql_log_warn, vha, 0x800c,
"do_reset failed for cmd=%p.\n", cmd);

6
scst/src/scst_lib.c
View File

@@ -8249,7 +8249,8 @@ static struct request *blk_make_request(struct request_queue *q,
if (IS_ERR(rq))
return rq;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) || \
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) || \
defined(CONFIG_SUSE_KERNEL)
scsi_req_init(scsi_req(rq));
#else
@@ -8480,7 +8481,8 @@ static struct request *blk_map_kern_sg(struct request_queue *q,
if (unlikely(!rq))
return ERR_PTR(-ENOMEM);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) || \
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) || \
defined(CONFIG_SUSE_KERNEL)
scsi_req_init(scsi_req(rq));
#else

4
scst_local/scst_local.c
View File

@@ -763,7 +763,7 @@ static int scst_local_abort(struct scsi_cmnd *scmd)
sess = to_scst_lcl_sess(scsi_get_device(scmd->device->host));
ret = scst_rx_mgmt_fn_tag(sess->scst_sess, SCST_ABORT_TASK,
blk_mq_unique_tag(scmd->request),
blk_mq_unique_tag(scsi_cmd_to_rq(scmd)),
false, &dev_reset_completion);
/* Now wait for the completion ... */
@@ -962,7 +962,7 @@ static int scst_local_queuecommand_lck(struct scsi_cmnd *scmd,
return SCSI_MLQUEUE_HOST_BUSY;
}
scst_cmd_set_tag(scst_cmd, blk_mq_unique_tag(scmd->request));
scst_cmd_set_tag(scst_cmd, blk_mq_unique_tag(scsi_cmd_to_rq(scmd)));
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
if (scmd->device->tagged_supported && scmd->device->simple_tags)
scst_cmd_set_queue_type(scst_cmd, SCST_CMD_QUEUE_SIMPLE);