From: Jarod Wilson <ja...@redhat.com> With the mutex_trylock bit gone from blkdev_reread_part(), the retry logic in dasd_scan_partitions() shouldn't be necessary.
CC: Christoph Hellwig <h...@infradead.org> CC: Jens Axboe <ax...@kernel.dk> CC: Tejun Heo <t...@kernel.org> CC: Alexander Viro <v...@zeniv.linux.org.uk> CC: Markus Pargmann <m...@pengutronix.de> CC: Stefan Weinhuber <w...@de.ibm.com> CC: Stefan Haberland <stefan.haberl...@de.ibm.com> CC: Sebastian Ott <seb...@linux.vnet.ibm.com> CC: Fabian Frederick <f...@skynet.be> CC: Ming Lei <ming....@canonical.com> CC: David Herrmann <dh.herrm...@gmail.com> CC: Andrew Morton <a...@linux-foundation.org> CC: Peter Zijlstra <pet...@infradead.org> CC: nbd-gene...@lists.sourceforge.net CC: linux-s...@vger.kernel.org Signed-off-by: Jarod Wilson <ja...@redhat.com> --- drivers/s390/block/dasd_genhd.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c index 2af4619..189ea2f 100644 --- a/drivers/s390/block/dasd_genhd.c +++ b/drivers/s390/block/dasd_genhd.c @@ -99,9 +99,8 @@ void dasd_gendisk_free(struct dasd_block *block) int dasd_scan_partitions(struct dasd_block *block) { struct block_device *bdev; - int retry, rc; + int rc; - retry = 5; bdev = bdget_disk(block->gdp, 0); if (!bdev) { DBF_DEV_EVENT(DBF_ERR, block->base, "%s", @@ -118,14 +117,8 @@ int dasd_scan_partitions(struct dasd_block *block) } rc = blkdev_reread_part(bdev); - while (rc == -EBUSY && retry > 0) { - schedule(); - rc = blkdev_reread_part(bdev); - retry--; - DBF_DEV_EVENT(DBF_ERR, block->base, - "scan partitions error, retry %d rc %d", - retry, rc); - } + DBF_DEV_EVENT(DBF_ERR, block->base, + "scan partitions error, rc %d", rc); /* * Since the matching blkdev_put call to the blkdev_get in -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/