[S390] dasd PAV enabling.

The subsystem check in the PAV code is incorrect, it enables PAV
per device instead of per subsystem.

Signed-off-by: Horst Hummel <horst.hummel@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index 9d0c6e1a0e6..9af02c79ce8 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -54,11 +54,11 @@ struct dasd_devmap {
  */
 struct dasd_server_ssid_map {
         struct list_head list;
-        struct server_id {
+        struct system_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->sid.ssid = 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;