On Wed, 8 Apr 2015, Ming Lei wrote:
> From: Jarod Wilson <jarod@xxxxxxxxxx>
>
> With the mutex_trylock bit gone from blkdev_reread_part(), the retry logic
> in dasd_scan_partitions() shouldn't be necessary.
>
> CC: Christoph Hellwig <hch@xxxxxxxxxxxxx>
> CC: Jens Axboe <axboe@xxxxxxxxx>
> CC: Tejun Heo <tj@xxxxxxxxxx>
> CC: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx>
> CC: Markus Pargmann <mpa@xxxxxxxxxxxxxx>
> CC: Stefan Weinhuber <wein@xxxxxxxxxx>
> CC: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
> CC: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
> CC: Fabian Frederick <fabf@xxxxxxxxx>
> CC: Ming Lei <ming.lei@xxxxxxxxxxxxx>
> CC: David Herrmann <dh.herrmann@xxxxxxxxx>
> CC: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> CC: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
> CC: nbd-general@xxxxxxxxxxxxxxxxxxxxx
> CC: linux-s390@xxxxxxxxxxxxxxx
> Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
> ---
> 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);
Could you please change that to only write the debug message in the error
case. Other than that, both dasd patches look good.
Thanks,
Sebastian
>
> /*
> * 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-s390" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
