On Wed, Apr 08, 2015 at 07:32:24PM +0200, Sebastian Ott wrote: > On Wed, 8 Apr 2015, Ming Lei wrote: > > From: Jarod Wilson <[email protected]> > > > > 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] > > Signed-off-by: Jarod Wilson <[email protected]> > > --- > > 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.
D'oh, absolutely. Ming, do you want me to send an updated patch 7 along in reply here, or do you want to handle it and/or repost the entire set? -- Jarod Wilson [email protected] -- 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/
