Skip to content

Commit

Permalink
[S390] dcssblk: revert devt conversion
Browse files Browse the repository at this point in the history
git commit f331c02 changed users of
->first_minor to devt. This broke device handling in dcssblk, so that
no additional devices could be added after the first one.

This patch reverts the devt conversion to the previous ->first_minor
handling.

Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Gerald Schaefer authored and Martin Schwidefsky committed Jun 12, 2009
1 parent 6b9d8e8 commit d059148
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/s390/block/dcssblk.c
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ dcssblk_assign_free_minor(struct dcssblk_dev_info *dev_info)
found = 0;
// test if minor available
list_for_each_entry(entry, &dcssblk_devices, lh)
if (minor == MINOR(disk_devt(entry->gd)))
if (minor == entry->gd->first_minor)
found++;
if (!found) break; // got unused minor
}
Expand Down Expand Up @@ -625,7 +625,7 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
if (rc)
goto release_gd;
sprintf(dev_info->gd->disk_name, "dcssblk%d",
MINOR(disk_devt(dev_info->gd)));
dev_info->gd->first_minor);
list_add_tail(&dev_info->lh, &dcssblk_devices);

if (!try_module_get(THIS_MODULE)) {
Expand Down

0 comments on commit d059148

Please sign in to comment.