Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
d8188b10
K
Kernel
项目概览
openeuler
/
Kernel
1 年多 前同步成功
通知
8
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
d8188b10
编写于
8年前
作者:
J
James Bottomley
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'mkp-scsi/4.9/scsi-fixes' into fixes
上级
8a57646d
c733ab35
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
9 deletion
+27
-9
drivers/scsi/mpt3sas/mpt3sas_scsih.c
drivers/scsi/mpt3sas/mpt3sas_scsih.c
+14
-1
drivers/scsi/qla2xxx/qla_os.c
drivers/scsi/qla2xxx/qla_os.c
+13
-8
未找到文件。
drivers/scsi/mpt3sas/mpt3sas_scsih.c
浏览文件 @
d8188b10
...
...
@@ -4010,7 +4010,10 @@ _scsih_eedp_error_handling(struct scsi_cmnd *scmd, u16 ioc_status)
SAM_STAT_CHECK_CONDITION
;
}
static
inline
bool
ata_12_16_cmd
(
struct
scsi_cmnd
*
scmd
)
{
return
(
scmd
->
cmnd
[
0
]
==
ATA_12
||
scmd
->
cmnd
[
0
]
==
ATA_16
);
}
/**
* scsih_qcmd - main scsi request entry point
...
...
@@ -4038,6 +4041,13 @@ scsih_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *scmd)
if
(
ioc
->
logging_level
&
MPT_DEBUG_SCSI
)
scsi_print_command
(
scmd
);
/*
* Lock the device for any subsequent command until command is
* done.
*/
if
(
ata_12_16_cmd
(
scmd
))
scsi_internal_device_block
(
scmd
->
device
);
sas_device_priv_data
=
scmd
->
device
->
hostdata
;
if
(
!
sas_device_priv_data
||
!
sas_device_priv_data
->
sas_target
)
{
scmd
->
result
=
DID_NO_CONNECT
<<
16
;
...
...
@@ -4613,6 +4623,9 @@ _scsih_io_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply)
if
(
scmd
==
NULL
)
return
1
;
if
(
ata_12_16_cmd
(
scmd
))
scsi_internal_device_unblock
(
scmd
->
device
,
SDEV_RUNNING
);
mpi_request
=
mpt3sas_base_get_msg_frame
(
ioc
,
smid
);
if
(
mpi_reply
==
NULL
)
{
...
...
This diff is collapsed.
Click to expand it.
drivers/scsi/qla2xxx/qla_os.c
浏览文件 @
d8188b10
...
...
@@ -1456,15 +1456,20 @@ qla2x00_abort_all_cmds(scsi_qla_host_t *vha, int res)
for
(
cnt
=
1
;
cnt
<
req
->
num_outstanding_cmds
;
cnt
++
)
{
sp
=
req
->
outstanding_cmds
[
cnt
];
if
(
sp
)
{
/* Get a reference to the sp and drop the lock.
* The reference ensures this sp->done() call
* - and not the call in qla2xxx_eh_abort() -
* ends the SCSI command (with result 'res').
/* Don't abort commands in adapter during EEH
* recovery as it's not accessible/responding.
*/
sp_get
(
sp
);
spin_unlock_irqrestore
(
&
ha
->
hardware_lock
,
flags
);
qla2xxx_eh_abort
(
GET_CMD_SP
(
sp
));
spin_lock_irqsave
(
&
ha
->
hardware_lock
,
flags
);
if
(
!
ha
->
flags
.
eeh_busy
)
{
/* Get a reference to the sp and drop the lock.
* The reference ensures this sp->done() call
* - and not the call in qla2xxx_eh_abort() -
* ends the SCSI command (with result 'res').
*/
sp_get
(
sp
);
spin_unlock_irqrestore
(
&
ha
->
hardware_lock
,
flags
);
qla2xxx_eh_abort
(
GET_CMD_SP
(
sp
));
spin_lock_irqsave
(
&
ha
->
hardware_lock
,
flags
);
}
req
->
outstanding_cmds
[
cnt
]
=
NULL
;
sp
->
done
(
vha
,
sp
,
res
);
}
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录