Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
14a5916e
L
linux
项目概览
xiphi1978
/
linux
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
14a5916e
编写于
8月 19, 2016
作者:
J
James Bottomley
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'mkp-scsi/4.8/scsi-fixes' into fixes
上级
01b3add8
a0f81dbe
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
10 addition
and
22 deletion
+10
-22
drivers/scsi/constants.c
drivers/scsi/constants.c
+3
-2
drivers/scsi/scsi_devinfo.c
drivers/scsi/scsi_devinfo.c
+4
-0
drivers/scsi/scsi_transport_sas.c
drivers/scsi/scsi_transport_sas.c
+0
-16
drivers/scsi/ses.c
drivers/scsi/ses.c
+1
-1
include/scsi/scsi_transport_sas.h
include/scsi/scsi_transport_sas.h
+2
-3
未找到文件。
drivers/scsi/constants.c
浏览文件 @
14a5916e
...
...
@@ -361,8 +361,9 @@ static const char * const snstext[] = {
/* Get sense key string or NULL if not available */
const
char
*
scsi_sense_key_string
(
unsigned
char
key
)
{
if
(
key
<=
0xE
)
scsi_sense_key_string
(
unsigned
char
key
)
{
if
(
key
<
ARRAY_SIZE
(
snstext
))
return
snstext
[
key
];
return
NULL
;
}
...
...
drivers/scsi/scsi_devinfo.c
浏览文件 @
14a5916e
...
...
@@ -246,6 +246,10 @@ static struct {
{
"IBM"
,
"Universal Xport"
,
"*"
,
BLIST_NO_ULD_ATTACH
},
{
"SUN"
,
"Universal Xport"
,
"*"
,
BLIST_NO_ULD_ATTACH
},
{
"DELL"
,
"Universal Xport"
,
"*"
,
BLIST_NO_ULD_ATTACH
},
{
"STK"
,
"Universal Xport"
,
"*"
,
BLIST_NO_ULD_ATTACH
},
{
"NETAPP"
,
"Universal Xport"
,
"*"
,
BLIST_NO_ULD_ATTACH
},
{
"LSI"
,
"Universal Xport"
,
"*"
,
BLIST_NO_ULD_ATTACH
},
{
"ENGENIO"
,
"Universal Xport"
,
"*"
,
BLIST_NO_ULD_ATTACH
},
{
"SMSC"
,
"USB 2 HS-CF"
,
NULL
,
BLIST_SPARSELUN
|
BLIST_INQUIRY_36
},
{
"SONY"
,
"CD-ROM CDU-8001"
,
NULL
,
BLIST_BORKEN
},
{
"SONY"
,
"TSL"
,
NULL
,
BLIST_FORCELUN
},
/* DDS3 & DDS4 autoloaders */
...
...
drivers/scsi/scsi_transport_sas.c
浏览文件 @
14a5916e
...
...
@@ -340,22 +340,6 @@ static int do_sas_phy_delete(struct device *dev, void *data)
return
0
;
}
/**
* is_sas_attached - check if device is SAS attached
* @sdev: scsi device to check
*
* returns true if the device is SAS attached
*/
int
is_sas_attached
(
struct
scsi_device
*
sdev
)
{
struct
Scsi_Host
*
shost
=
sdev
->
host
;
return
shost
->
transportt
->
host_attrs
.
ac
.
class
==
&
sas_host_class
.
class
;
}
EXPORT_SYMBOL
(
is_sas_attached
);
/**
* sas_remove_children - tear down a devices SAS data structures
* @dev: device belonging to the sas object
...
...
drivers/scsi/ses.c
浏览文件 @
14a5916e
...
...
@@ -587,7 +587,7 @@ static void ses_match_to_enclosure(struct enclosure_device *edev,
ses_enclosure_data_process
(
edev
,
to_scsi_device
(
edev
->
edev
.
parent
),
0
);
if
(
is_sas_attached
(
s
dev
))
if
(
scsi_is_sas_rphy
(
&
sdev
->
sdev_gen
dev
))
efd
.
addr
=
sas_get_address
(
sdev
);
if
(
efd
.
addr
)
{
...
...
include/scsi/scsi_transport_sas.h
浏览文件 @
14a5916e
...
...
@@ -11,12 +11,12 @@ struct sas_rphy;
struct
request
;
#if !IS_ENABLED(CONFIG_SCSI_SAS_ATTRS)
static
inline
int
is_sas_attached
(
struct
scsi_
device
*
sdev
)
static
inline
int
scsi_is_sas_rphy
(
const
struct
device
*
sdev
)
{
return
0
;
}
#else
extern
int
is_sas_attached
(
struct
scsi_device
*
sdev
);
extern
int
scsi_is_sas_rphy
(
const
struct
device
*
);
#endif
static
inline
int
sas_protocol_ata
(
enum
sas_protocol
proto
)
...
...
@@ -202,7 +202,6 @@ extern int sas_rphy_add(struct sas_rphy *);
extern
void
sas_rphy_remove
(
struct
sas_rphy
*
);
extern
void
sas_rphy_delete
(
struct
sas_rphy
*
);
extern
void
sas_rphy_unlink
(
struct
sas_rphy
*
);
extern
int
scsi_is_sas_rphy
(
const
struct
device
*
);
struct
sas_port
*
sas_port_alloc
(
struct
device
*
,
int
);
struct
sas_port
*
sas_port_alloc_num
(
struct
device
*
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录