Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 24216
b: refs/heads/master
c: 606f442
h: refs/heads/master
v: v3
  • Loading branch information
Eric Sesterhenn authored and Adrian Bunk committed Mar 26, 2006
1 parent 50f7dea commit 17f168a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f02e1fafb534459522a8c46bc46b32820684623e
refs/heads/master: 606f44228e257ea1e35557c2fec7133cca634096
6 changes: 2 additions & 4 deletions trunk/drivers/s390/block/dasd_devmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -437,8 +437,7 @@ dasd_forget_ranges(void)
spin_lock(&dasd_devmap_lock);
for (i = 0; i < 256; i++) {
list_for_each_entry_safe(devmap, n, &dasd_hashlists[i], list) {
if (devmap->device != NULL)
BUG();
BUG_ON(devmap->device != NULL);
list_del(&devmap->list);
kfree(devmap);
}
Expand Down Expand Up @@ -547,8 +546,7 @@ dasd_delete_device(struct dasd_device *device)

/* First remove device pointer from devmap. */
devmap = dasd_find_busid(device->cdev->dev.bus_id);
if (IS_ERR(devmap))
BUG();
BUG_ON(IS_ERR(devmap));
spin_lock(&dasd_devmap_lock);
if (devmap->device != device) {
spin_unlock(&dasd_devmap_lock);
Expand Down

0 comments on commit 17f168a

Please sign in to comment.