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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
s390
/
block
/
dasd_genhd.c
diff --git
a/drivers/s390/block/dasd_genhd.c
b/drivers/s390/block/dasd_genhd.c
index
96c4934
..
fce2835
100644
(file)
--- a/
drivers/s390/block/dasd_genhd.c
+++ b/
drivers/s390/block/dasd_genhd.c
@@
-9,7
+9,6
@@
*
* gendisk related functions for the dasd driver.
*
*
* gendisk related functions for the dasd driver.
*
- * $Revision: 1.50 $
*/
#include <linux/config.h>
*/
#include <linux/config.h>
@@
-31,16
+30,12
@@
int
dasd_gendisk_alloc(struct dasd_device *device)
{
struct gendisk *gdp;
dasd_gendisk_alloc(struct dasd_device *device)
{
struct gendisk *gdp;
- int len
, feature_ro
;
+ int len;
/* Make sure the minor for this device exists. */
if (device->devindex >= DASD_PER_MAJOR)
return -EBUSY;
/* Make sure the minor for this device exists. */
if (device->devindex >= DASD_PER_MAJOR)
return -EBUSY;
- feature_ro = dasd_get_feature(device->cdev, DASD_FEATURE_READONLY);
- if (feature_ro < 0)
- return feature_ro;
-
gdp = alloc_disk(1 << DASD_PARTN_BITS);
if (!gdp)
return -ENOMEM;
gdp = alloc_disk(1 << DASD_PARTN_BITS);
if (!gdp)
return -ENOMEM;
@@
-75,7
+70,7
@@
dasd_gendisk_alloc(struct dasd_device *device)
sprintf(gdp->devfs_name, "dasd/%s", device->cdev->dev.bus_id);
sprintf(gdp->devfs_name, "dasd/%s", device->cdev->dev.bus_id);
- if (
feature_ro
)
+ if (
device->features & DASD_FEATURE_READONLY
)
set_disk_ro(gdp, 1);
gdp->private_data = device;
gdp->queue = device->request_queue;
set_disk_ro(gdp, 1);
gdp->private_data = device;
gdp->queue = device->request_queue;
@@
-105,8
+100,6
@@
dasd_scan_partitions(struct dasd_device * device)
{
struct block_device *bdev;
{
struct block_device *bdev;
- /* Make the disk known. */
- set_capacity(device->gdp, device->blocks << device->s2b_shift);
bdev = bdget_disk(device->gdp, 0);
if (!bdev || blkdev_get(bdev, FMODE_READ, 1) < 0)
return -ENODEV;
bdev = bdget_disk(device->gdp, 0);
if (!bdev || blkdev_get(bdev, FMODE_READ, 1) < 0)
return -ENODEV;