Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / drivers / s390 / block / dasd_alias.c

diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c
index 2d8df0b305386f9dbfe75f98ee7bec54fd8d8404..20676cdef4a519802b1d1a605d637f21ae64319b 100644 (file)
--- a/drivers/s390/block/dasd_alias.c
+++ b/drivers/s390/block/dasd_alias.c
@@ -91,7 +91,8 @@ static struct alias_pav_group *_find_group(struct alias_lcu *lcu,
        else
                search_unit_addr = uid->base_unit_addr;
        list_for_each_entry(pos, &lcu->grouplist, group) {
-               if (pos->uid.base_unit_addr == search_unit_addr)
+               if (pos->uid.base_unit_addr == search_unit_addr &&
+                   !strncmp(pos->uid.vduit, uid->vduit, sizeof(uid->vduit)))
                        return pos;
        };
        return NULL;
@@ -332,6 +333,7 @@ static int _add_device_to_lcu(struct alias_lcu *lcu,
                        group->uid.base_unit_addr = uid->real_unit_addr;
                else
                        group->uid.base_unit_addr = uid->base_unit_addr;
+               memcpy(group->uid.vduit, uid->vduit, sizeof(uid->vduit));
                INIT_LIST_HEAD(&group->group);
                INIT_LIST_HEAD(&group->baselist);
                INIT_LIST_HEAD(&group->aliaslist);