diff options
| author | Jarod Wilson <[email protected]> | 2015-05-06 12:26:28 +0800 |
|---|---|---|
| committer | Jens Axboe <[email protected]> | 2015-05-20 09:06:17 -0600 |
| commit | a05e578055d7f9ec2d5c4465933eb424c4e8e25b (patch) | |
| tree | 97d307e805cc7ab98c50b9bccbeca6f76bccf0e2 | |
| parent | 6029a06c88b925467cb43e4b57dcede88f0457eb (diff) | |
s390/block/dasd: remove obsolete while -EBUSY loop
With the mutex_trylock bit gone from blkdev_reread_part(), the retry logic
in dasd_scan_partitions() shouldn't be necessary.
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: Andrew Morton <[email protected]>
CC: Peter Zijlstra <[email protected]>
CC: [email protected]
CC: [email protected]
Reviewed-by: Christoph Hellwig <[email protected]>
Acked-by: Sebastian Ott <[email protected]>
Signed-off-by: Ming Lei <[email protected]>
Signed-off-by: Jarod Wilson <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
| -rw-r--r-- | drivers/s390/block/dasd_genhd.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c index 2af461923683..ef1d9fb06cab 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,9 @@ 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--; + if (rc) DBF_DEV_EVENT(DBF_ERR, block->base, - "scan partitions error, retry %d rc %d", - retry, rc); - } + "scan partitions error, rc %d", rc); /* * Since the matching blkdev_put call to the blkdev_get in |