git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
s390
/
char
/
tape_block.c
diff --git
a/drivers/s390/char/tape_block.c
b/drivers/s390/char/tape_block.c
index
b70d926
..
5ced272
100644
(file)
--- a/
drivers/s390/char/tape_block.c
+++ b/
drivers/s390/char/tape_block.c
@@
-198,7
+198,9
@@
tapeblock_request_fn(request_queue_t *queue)
device = (struct tape_device *) queue->queuedata;
DBF_LH(6, "tapeblock_request_fn(device=%p)\n", device);
device = (struct tape_device *) queue->queuedata;
DBF_LH(6, "tapeblock_request_fn(device=%p)\n", device);
- BUG_ON(device == NULL);
+ if (device == NULL)
+ BUG();
+
tapeblock_trigger_requeue(device);
}
tapeblock_trigger_requeue(device);
}
@@
-305,7
+307,8
@@
tapeblock_revalidate_disk(struct gendisk *disk)
int rc;
device = (struct tape_device *) disk->private_data;
int rc;
device = (struct tape_device *) disk->private_data;
- BUG_ON(!device);
+ if (!device)
+ BUG();
if (!device->blk_data.medium_changed)
return 0;
if (!device->blk_data.medium_changed)
return 0;
@@
-432,14
+435,16
@@
tapeblock_ioctl(
) {
int rc;
int minor;
) {
int rc;
int minor;
- struct gendisk *disk;
- struct tape_device *device;
+ struct gendisk *disk
= inode->i_bdev->bd_disk
;
+ struct tape_device *device
= disk->private_data
;
rc = 0;
disk = inode->i_bdev->bd_disk;
rc = 0;
disk = inode->i_bdev->bd_disk;
- BUG_ON(!disk);
+ if (!disk)
+ BUG();
device = disk->private_data;
device = disk->private_data;
- BUG_ON(!device);
+ if (!device)
+ BUG();
minor = iminor(inode);
DBF_LH(6, "tapeblock_ioctl(0x%0x)\n", command);
minor = iminor(inode);
DBF_LH(6, "tapeblock_ioctl(0x%0x)\n", command);