From patchwork Thu Nov 21 17:13:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Suchanek X-Patchwork-Id: 11256571 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7D39F138C for ; Thu, 21 Nov 2019 17:13:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6759C20708 for ; Thu, 21 Nov 2019 17:13:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727193AbfKURNo (ORCPT ); Thu, 21 Nov 2019 12:13:44 -0500 Received: from mx2.suse.de ([195.135.220.15]:54298 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727165AbfKURNo (ORCPT ); Thu, 21 Nov 2019 12:13:44 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 2B3A0B27A; Thu, 21 Nov 2019 17:13:41 +0000 (UTC) From: Michal Suchanek To: linux-scsi@vger.kernel.org, linux-block@vger.kernel.org Cc: Michal Suchanek , Jonathan Corbet , Jens Axboe , "James E.J. Bottomley" , "Martin K. Petersen" , Alexander Viro , Eric Biggers , "J. Bruce Fields" , Mauro Carvalho Chehab , Benjamin Coddington , Ming Lei , Chaitanya Kulkarni , Bart Van Assche , Damien Le Moal , Hou Tao , Pavel Begunkov , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Jan Kara , Hannes Reinecke , "Ewan D. Milne" , Christoph Hellwig , Matthew Wilcox Subject: [PATCH v4 07/10] bdev: separate parts of __blkdev_get as helper functions Date: Thu, 21 Nov 2019 18:13:14 +0100 Message-Id: <49c843f88373d9ad4f6e607f704f51ca84c1747d.1574355709.git.msuchanek@suse.de> X-Mailer: git-send-email 2.23.0 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org This code will be reused in later patch. Hopefully putting it aside rather than cut&pasting another copy will make the function more readable. Signed-off-by: Michal Suchanek --- fs/block_dev.c | 52 +++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/fs/block_dev.c b/fs/block_dev.c index a3083fbada8b..10c9e0ae2bdc 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -1512,6 +1512,28 @@ EXPORT_SYMBOL(bd_set_size); static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part); +static void blkdev_init_size(struct block_device *bdev, struct gendisk *disk) +{ + bd_set_size(bdev, (loff_t)get_capacity(disk) << 9); + set_init_blocksize(bdev); +} + +static void blkdev_do_partitions(struct block_device *bdev, + struct gendisk *disk, int ret) +{ + /* + * If the device is invalidated, rescan partition if open succeeded or + * failed with -ENOMEDIUM. The latter is necessary to prevent ghost + * partitions on a removed medium. + */ + if (bdev->bd_invalidated) { + if (!ret) + rescan_partitions(disk, bdev); + else if (ret == -ENOMEDIUM) + invalidate_partitions(disk, bdev); + } +} + /* * bd_mutex locking: * @@ -1584,23 +1606,9 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) } } - if (!ret) { - bd_set_size(bdev,(loff_t)get_capacity(disk)<<9); - set_init_blocksize(bdev); - } - - /* - * If the device is invalidated, rescan partition - * if open succeeded or failed with -ENOMEDIUM. - * The latter is necessary to prevent ghost - * partitions on a removed medium. - */ - if (bdev->bd_invalidated) { - if (!ret) - rescan_partitions(disk, bdev); - else if (ret == -ENOMEDIUM) - invalidate_partitions(disk, bdev); - } + if (!ret) + blkdev_init_size(bdev, disk); + blkdev_do_partitions(bdev, disk, ret); if (ret) goto out_clear; @@ -1632,13 +1640,9 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) ret = 0; if (bdev->bd_disk->fops->open) ret = bdev->bd_disk->fops->open(bdev, mode); - /* the same as first opener case, read comment there */ - if (bdev->bd_invalidated) { - if (!ret) - rescan_partitions(bdev->bd_disk, bdev); - else if (ret == -ENOMEDIUM) - invalidate_partitions(bdev->bd_disk, bdev); - } + + blkdev_do_partitions(bdev, disk, ret); + if (ret) goto out_unlock_bdev; }