lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 8 Apr 2015 02:23:46 -0400 From: Jarod Wilson <jarod@...hat.com> To: linux-kernel@...r.kernel.org Cc: Jarod Wilson <jarod@...hat.com>, Christoph Hellwig <hch@...radead.org>, Jens Axboe <axboe@...nel.dk>, Tejun Heo <tj@...nel.org>, Alexander Viro <viro@...iv.linux.org.uk>, Markus Pargmann <mpa@...gutronix.de>, Stefan Weinhuber <wein@...ibm.com>, Stefan Haberland <stefan.haberland@...ibm.com>, Sebastian Ott <sebott@...ux.vnet.ibm.com>, Fabian Frederick <fabf@...net.be>, Ming Lei <ming.lei@...onical.com>, David Herrmann <dh.herrmann@...il.com>, Mike Galbraith <bitbucket@...ine.de>, Andrew Morton <akpm@...ux-foundation.org>, Peter Zijlstra <peterz@...radead.org>, nbd-general@...ts.sourceforge.net, linux-s390@...r.kernel.org Subject: [PATCH 7/7] 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 <hch@...radead.org> CC: Jens Axboe <axboe@...nel.dk> CC: Tejun Heo <tj@...nel.org> CC: Alexander Viro <viro@...iv.linux.org.uk> CC: Markus Pargmann <mpa@...gutronix.de> CC: Stefan Weinhuber <wein@...ibm.com> CC: Stefan Haberland <stefan.haberland@...ibm.com> CC: Sebastian Ott <sebott@...ux.vnet.ibm.com> CC: Fabian Frederick <fabf@...net.be> CC: Ming Lei <ming.lei@...onical.com> CC: David Herrmann <dh.herrmann@...il.com> CC: Mike Galbraith <bitbucket@...ine.de> CC: Andrew Morton <akpm@...ux-foundation.org> CC: Peter Zijlstra <peterz@...radead.org> CC: nbd-general@...ts.sourceforge.net CC: linux-s390@...r.kernel.org Signed-off-by: Jarod Wilson <jarod@...hat.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 8026585..783d826 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.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists