| Message ID | 20200921071958.307589-9-hch@lst.de |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | [01/14] block: move the NEED_PART_SCAN flag to struct gendisk | expand |
Hello! On 21.09.2020 10:19, Christoph Hellwig wrote: > Use blkdev_get_by_dev instead of bdget_disk + blkdev_get. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > drivers/s390/block/dasd_genhd.c | 15 ++++----------- > 1 file changed, 4 insertions(+), 11 deletions(-) > > diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c > index af5b0ecb8f8923..a9698fba9b76ce 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", blkdev_get_by_dev() now? > + PTR_ERR(bdev)); > return -ENODEV; > } > MBR, Sergei
Am 21.09.20 um 09:19 schrieb Christoph Hellwig: > Use blkdev_get_by_dev instead of bdget_disk + blkdev_get. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Beside what Sergei mentioned... Reviewed-by: Stefan Haberland <sth@linux.ibm.com> > --- > drivers/s390/block/dasd_genhd.c | 15 ++++----------- > 1 file changed, 4 insertions(+), 11 deletions(-) > > diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c > index af5b0ecb8f8923..a9698fba9b76ce 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; > } >
diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c index af5b0ecb8f8923..a9698fba9b76ce 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; }
Use blkdev_get_by_dev instead of bdget_disk + blkdev_get. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/s390/block/dasd_genhd.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)