Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
428a7e3e
Commit
428a7e3e
authored
Aug 24, 2006
by
Greg Kroah-Hartman
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-linus' of
git://git390.osdl.marist.edu/pub/scm/linux-2.6
parents
7bf13484
8e79a441
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+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
No files found.
drivers/s390/block/dasd_devmap.c
View file @
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
View file @
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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment