Skip to content

Commit

Permalink
s390/block/dasd: remove obsolete while -EBUSY loop
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
jarodwilson authored and axboe committed May 20, 2015
1 parent 6029a06 commit a05e578
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions drivers/s390/block/dasd_genhd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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
Expand Down

0 comments on commit a05e578

Please sign in to comment.