From: Ming Lei <[email protected]> Also remove the obsolete comment.
CC: Christoph Hellwig <[email protected]> CC: Jens Axboe <[email protected]> CC: Tejun Heo <[email protected]> CC: Alexander Viro <[email protected]> CC: Markus Pargmann <[email protected]> CC: Stefan Weinhuber <[email protected]> CC: Stefan Haberland <[email protected]> CC: Sebastian Ott <[email protected]> CC: Fabian Frederick <[email protected]> CC: Ming Lei <[email protected]> CC: David Herrmann <[email protected]> CC: Mike Galbraith <[email protected]> CC: Andrew Morton <[email protected]> CC: Peter Zijlstra <[email protected]> CC: [email protected] CC: [email protected] Signed-off-by: Ming Lei <[email protected]> Signed-off-by: Jarod Wilson <[email protected]> --- drivers/s390/block/dasd_genhd.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c index 90f39f7..8026585 100644 --- a/drivers/s390/block/dasd_genhd.c +++ b/drivers/s390/block/dasd_genhd.c @@ -116,14 +116,11 @@ int dasd_scan_partitions(struct dasd_block *block) rc); return -ENODEV; } - /* - * See fs/partition/check.c:register_disk,rescan_partitions - * Can't call rescan_partitions directly. Use ioctl. - */ - rc = ioctl_by_bdev(bdev, BLKRRPART, 0); + + rc = blkdev_reread_part(bdev); while (rc == -EBUSY && retry > 0) { schedule(); - rc = ioctl_by_bdev(bdev, BLKRRPART, 0); + rc = blkdev_reread_part(bdev); retry--; DBF_DEV_EVENT(DBF_ERR, block->base, "scan partitions error, retry %d rc %d", @@ -138,7 +135,7 @@ int dasd_scan_partitions(struct dasd_block *block) * dasd_generic_set_offline). As long as the partition * detection is running no offline should be allowed. That * is why the assignment to device->bdev is done AFTER - * the BLKRRPART ioctl. + * the blkdev_reread_part() call. */ block->bdev = bdev; return 0; -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/

