Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
428a7e3e
cloud-kernel
项目概览
openanolis
/
cloud-kernel
大约 1 年 前同步成功
通知
152
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
428a7e3e
编写于
8月 24, 2006
作者:
G
Greg Kroah-Hartman
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'for-linus' of
git://git390.osdl.marist.edu/pub/scm/linux-2.6
上级
7bf13484
8e79a441
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
11 deletion
+11
-11
drivers/s390/block/dasd_devmap.c
drivers/s390/block/dasd_devmap.c
+4
-4
drivers/s390/block/dasd_eckd.c
drivers/s390/block/dasd_eckd.c
+7
-7
未找到文件。
drivers/s390/block/dasd_devmap.c
浏览文件 @
428a7e3e
...
...
@@ -54,11 +54,11 @@ struct dasd_devmap {
*/
struct
dasd_server_ssid_map
{
struct
list_head
list
;
struct
s
erver
_id
{
struct
s
ystem
_id
{
char
vendor
[
4
];
char
serial
[
15
];
__u16
ssid
;
}
sid
;
__u16
ssid
;
};
static
struct
list_head
dasd_server_ssid_list
;
...
...
@@ -904,14 +904,14 @@ dasd_set_uid(struct ccw_device *cdev, struct dasd_uid *uid)
return
-
ENOMEM
;
strncpy
(
srv
->
sid
.
vendor
,
uid
->
vendor
,
sizeof
(
srv
->
sid
.
vendor
)
-
1
);
strncpy
(
srv
->
sid
.
serial
,
uid
->
serial
,
sizeof
(
srv
->
sid
.
serial
)
-
1
);
srv
->
ssid
=
uid
->
ssid
;
srv
->
s
id
.
s
sid
=
uid
->
ssid
;
/* server is already contained ? */
spin_lock
(
&
dasd_devmap_lock
);
devmap
->
uid
=
*
uid
;
list_for_each_entry
(
tmp
,
&
dasd_server_ssid_list
,
list
)
{
if
(
!
memcmp
(
&
srv
->
sid
,
&
tmp
->
sid
,
sizeof
(
struct
dasd_server_ssid_map
)))
{
sizeof
(
struct
system_id
)))
{
kfree
(
srv
);
srv
=
NULL
;
break
;
...
...
drivers/s390/block/dasd_eckd.c
浏览文件 @
428a7e3e
...
...
@@ -607,7 +607,7 @@ dasd_eckd_psf_ssc(struct dasd_device *device)
* Valide storage server of current device.
*/
static
int
dasd_eckd_validate_server
(
struct
dasd_device
*
device
)
dasd_eckd_validate_server
(
struct
dasd_device
*
device
,
struct
dasd_uid
*
uid
)
{
int
rc
;
...
...
@@ -616,11 +616,11 @@ dasd_eckd_validate_server(struct dasd_device *device)
return
0
;
rc
=
dasd_eckd_psf_ssc
(
device
);
if
(
rc
)
/* may be requested feature is not available on server,
* therefore just report error and go ahead */
DEV_MESSAGE
(
KERN_INFO
,
device
,
"Perform Subsystem Function returned rc=%d"
,
rc
);
/* may be requested feature is not available on server,
* therefore just report error and go ahead */
DEV_MESSAGE
(
KERN_INFO
,
device
,
"PSF-SSC on storage subsystem %s.%s.%04x returned rc=%d"
,
uid
->
vendor
,
uid
->
serial
,
uid
->
ssid
,
rc
);
/* RE-Read Configuration Data */
return
dasd_eckd_read_conf
(
device
);
}
...
...
@@ -666,7 +666,7 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
return
rc
;
rc
=
dasd_set_uid
(
device
->
cdev
,
&
uid
);
if
(
rc
==
1
)
/* new server found */
rc
=
dasd_eckd_validate_server
(
device
);
rc
=
dasd_eckd_validate_server
(
device
,
&
uid
);
if
(
rc
)
return
rc
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录