diff options
| author |   Christoph Hellwig <hch@lst.de> | 2020-09-21 09:19:52 +0200 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2020-09-23 10:43:19 -0600 |
| commit | 841ab72cb5be3bbf6544f28329b81c73f0f835b3 (patch) | |
| tree | 41ff3f81a4b75aa3080b9107fc5609151b0af7d2 /drivers/s390/block/dasd_genhd.c | |
| parent | raw: don't keep unopened block device around (diff) | |
| download | linux-dev-841ab72cb5be3bbf6544f28329b81c73f0f835b3.tar.xz linux-dev-841ab72cb5be3bbf6544f28329b81c73f0f835b3.zip | |
dasd: cleanup dasd_scan_partitions
Use blkdev_get_by_dev instead of bdget_disk + blkdev_get.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Stefan Haberland <sth@linux.ibm.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/s390/block/dasd_genhd.c')
| -rw-r--r-- | drivers/s390/block/dasd_genhd.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c index af5b0ecb8f89..a9698fba9b76 100644 --- a/drivers/s390/block/dasd_genhd.c +++ b/drivers/s390/block/dasd_genhd.c @@ -101,18 +101,11 @@ int dasd_scan_partitions(struct dasd_block *block) struct block_device *bdev; int rc; - bdev = bdget_disk(block->gdp, 0); - if (!bdev) { - DBF_DEV_EVENT(DBF_ERR, block->base, "%s", - "scan partitions error, bdget returned NULL"); - return -ENODEV; - } - - rc = blkdev_get(bdev, FMODE_READ, NULL); - if (rc < 0) { + bdev = blkdev_get_by_dev(disk_devt(block->gdp), FMODE_READ, NULL); + if (IS_ERR(bdev)) { DBF_DEV_EVENT(DBF_ERR, block->base, - "scan partitions error, blkdev_get returned %d", - rc); + "scan partitions error, blkdev_get returned %ld", + PTR_ERR(bdev)); return -ENODEV; } |