diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-11-27 13:49:18 -0500 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-11-27 13:49:18 -0500 |
| commit | f30195c50245d8ace628e1978b1daa8df86e7224 (patch) | |
| tree | edf4f91c4356c41d50fb07f15cebd1e6442538ad /drivers/s390 | |
| parent | d07335e51df0c6dec202d315fc4f1f7e100eec4e (diff) | |
| parent | d4d77629953eabd3c14f6fa5746f6b28babfc55f (diff) | |
Merge branch 'cleanup-bd_claim' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into for-2.6.38/core
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/block/dasd_genhd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c index 30a1ca3d08b7..5505bc07e1e7 100644 --- a/drivers/s390/block/dasd_genhd.c +++ b/drivers/s390/block/dasd_genhd.c | |||
| @@ -103,7 +103,7 @@ int dasd_scan_partitions(struct dasd_block *block) | |||
| 103 | struct block_device *bdev; | 103 | struct block_device *bdev; |
| 104 | 104 | ||
| 105 | bdev = bdget_disk(block->gdp, 0); | 105 | bdev = bdget_disk(block->gdp, 0); |
| 106 | if (!bdev || blkdev_get(bdev, FMODE_READ) < 0) | 106 | if (!bdev || blkdev_get(bdev, FMODE_READ, NULL) < 0) |
| 107 | return -ENODEV; | 107 | return -ENODEV; |
| 108 | /* | 108 | /* |
| 109 | * See fs/partition/check.c:register_disk,rescan_partitions | 109 | * See fs/partition/check.c:register_disk,rescan_partitions |