From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753318AbbDHGZV (ORCPT ); Wed, 8 Apr 2015 02:25:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52684 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753206AbbDHGZN (ORCPT ); Wed, 8 Apr 2015 02:25:13 -0400 From: Jarod Wilson To: linux-kernel@vger.kernel.org Cc: Ming Lei , Christoph Hellwig , Jens Axboe , Tejun Heo , Alexander Viro , Markus Pargmann , Stefan Weinhuber , Stefan Haberland , Sebastian Ott , Fabian Frederick , David Herrmann , Mike Galbraith , Andrew Morton , Peter Zijlstra , nbd-general@lists.sourceforge.net, linux-s390@vger.kernel.org, Jarod Wilson Subject: [PATCH 5/7] block: dasd_genhd: convert to blkdev_reread_part Date: Wed, 8 Apr 2015 02:23:44 -0400 Message-Id: <1428474226-27386-6-git-send-email-jarod@redhat.com> In-Reply-To: <1428474226-27386-1-git-send-email-jarod@redhat.com> References: <1428218688-4092-1-git-send-email-ming.lei@canonical.com> <1428474226-27386-1-git-send-email-jarod@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ming Lei Also remove the obsolete comment. CC: Christoph Hellwig CC: Jens Axboe CC: Tejun Heo CC: Alexander Viro CC: Markus Pargmann CC: Stefan Weinhuber CC: Stefan Haberland CC: Sebastian Ott CC: Fabian Frederick CC: Ming Lei CC: David Herrmann CC: Mike Galbraith CC: Andrew Morton CC: Peter Zijlstra CC: nbd-general@lists.sourceforge.net CC: linux-s390@vger.kernel.org Signed-off-by: Ming Lei Signed-off-by: Jarod Wilson --- drivers/s390/block/dasd_genhd.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c index 90f39f7..8026585 100644 --- a/drivers/s390/block/dasd_genhd.c +++ b/drivers/s390/block/dasd_genhd.c @@ -116,14 +116,11 @@ int dasd_scan_partitions(struct dasd_block *block) rc); return -ENODEV; } - /* - * See fs/partition/check.c:register_disk,rescan_partitions - * Can't call rescan_partitions directly. Use ioctl. - */ - rc = ioctl_by_bdev(bdev, BLKRRPART, 0); + + rc = blkdev_reread_part(bdev); while (rc == -EBUSY && retry > 0) { schedule(); - rc = ioctl_by_bdev(bdev, BLKRRPART, 0); + rc = blkdev_reread_part(bdev); retry--; DBF_DEV_EVENT(DBF_ERR, block->base, "scan partitions error, retry %d rc %d", @@ -138,7 +135,7 @@ int dasd_scan_partitions(struct dasd_block *block) * dasd_generic_set_offline). As long as the partition * detection is running no offline should be allowed. That * is why the assignment to device->bdev is done AFTER - * the BLKRRPART ioctl. + * the blkdev_reread_part() call. */ block->bdev = bdev; return 0; -- 1.8.3.1