From: Michal Suchanek <msuchanek@suse.de>
To: linux-scsi@vger.kernel.org, linux-block@vger.kernel.org
Cc: Michal Suchanek <msuchanek@suse.de>,
Jonathan Corbet <corbet@lwn.net>, Jens Axboe <axboe@kernel.dk>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Eric Biggers <ebiggers@google.com>,
"J. Bruce Fields" <bfields@redhat.com>,
Mauro Carvalho Chehab <mchehab+samsung@kernel.org>,
Benjamin Coddington <bcodding@redhat.com>,
Ming Lei <ming.lei@redhat.com>,
Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>,
Bart Van Assche <bvanassche@acm.org>,
Damien Le Moal <damien.lemoal@wdc.com>,
Hou Tao <houtao1@huawei.com>,
Pavel Begunkov <asml.silence@gmail.com>,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
Jan Kara <jack@suse.cz>, Hannes Reinecke <hare@suse.com>,
"Ewan D. Milne" <emilne@redhat.com>,
Christoph Hellwig <hch@infradead.org>,
Matthew Wilcox <willy@infradead.org>
Subject: [PATCH v4 rebase 07/10] bdev: separate parts of __blkdev_get as helper functions
Date: Tue, 26 Nov 2019 20:54:26 +0100 [thread overview]
Message-ID: <1bf484f0003874d8bc6935ed4653e40ba597afd4.1574797504.git.msuchanek@suse.de> (raw)
In-Reply-To: <cover.1574797504.git.msuchanek@suse.de>
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 <msuchanek@suse.de>
---
fs/block_dev.c | 42 ++++++++++++++++++++++++------------------
1 file changed, 24 insertions(+), 18 deletions(-)
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 545bb6c8848a..a386ebd997fb 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1547,6 +1547,24 @@ int bdev_disk_changed(struct block_device *bdev, bool invalidate)
*/
EXPORT_SYMBOL_GPL(bdev_disk_changed);
+static void blkdev_init_size(struct block_device *bdev)
+{
+ bd_set_size(bdev, (loff_t)get_capacity(bdev->bd_disk) << 9);
+ set_init_blocksize(bdev);
+}
+
+static void blkdev_do_partitions(struct block_device *bdev, 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 &&
+ (!ret || ret == -ENOMEDIUM))
+ bdev_disk_changed(bdev, ret == -ENOMEDIUM);
+}
+
/*
* bd_mutex locking:
*
@@ -1619,20 +1637,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 &&
- (!ret || ret == -ENOMEDIUM))
- bdev_disk_changed(bdev, ret == -ENOMEDIUM);
+ if (!ret)
+ blkdev_init_size(bdev);
+ blkdev_do_partitions(bdev, ret);
if (ret)
goto out_clear;
@@ -1664,10 +1671,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 &&
- (!ret || ret == -ENOMEDIUM))
- bdev_disk_changed(bdev, ret == -ENOMEDIUM);
+
+ blkdev_do_partitions(bdev, ret);
+
if (ret)
goto out_unlock_bdev;
}
--
2.23.0
next prev parent reply other threads:[~2019-11-26 19:54 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-26 19:54 [PATCH v4 rebase 00/10] Fix cdrom autoclose Michal Suchanek
2019-11-26 19:54 ` [PATCH v4 rebase 01/10] cdrom: add poll_event_interruptible Michal Suchanek
2019-11-26 19:54 ` [PATCH v4 rebase 02/10] cdrom: factor out common open_for_* code Michal Suchanek
2019-11-26 19:54 ` [PATCH v4 rebase 03/10] cdrom: wait for the tray to close Michal Suchanek
2019-11-26 19:54 ` [PATCH v4 rebase 04/10] cdrom: export autoclose logic as a separate function Michal Suchanek
2019-11-26 19:54 ` [PATCH v4 rebase 05/10] cdrom: unify log messages Michal Suchanek
2019-11-26 19:54 ` [PATCH v4 rebase 06/10] bdev: reset first_open when looping in __blkget_dev Michal Suchanek
2019-11-26 19:54 ` Michal Suchanek [this message]
2019-11-26 19:54 ` [PATCH v4 rebase 08/10] bdev: add open_finish Michal Suchanek
2019-11-26 19:54 ` [PATCH v4 rebase 09/10] scsi: blacklist: add VMware ESXi cdrom - broken tray emulation Michal Suchanek
2019-11-26 19:54 ` [PATCH v4 rebase 10/10] scsi: sr: wait for the medium to become ready Michal Suchanek
2019-11-26 20:01 ` [PATCH v4 rebase 00/10] Fix cdrom autoclose Jens Axboe
2019-11-26 20:21 ` Michal Suchánek
2019-11-26 23:13 ` Jens Axboe
2019-11-27 8:11 ` Michal Suchánek
2019-12-04 19:01 ` Michal Suchánek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1bf484f0003874d8bc6935ed4653e40ba597afd4.1574797504.git.msuchanek@suse.de \
--to=msuchanek@suse.de \
--cc=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=bcodding@redhat.com \
--cc=bfields@redhat.com \
--cc=bvanassche@acm.org \
--cc=chaitanya.kulkarni@wdc.com \
--cc=corbet@lwn.net \
--cc=damien.lemoal@wdc.com \
--cc=ebiggers@google.com \
--cc=emilne@redhat.com \
--cc=hare@suse.com \
--cc=hch@infradead.org \
--cc=houtao1@huawei.com \
--cc=jack@suse.cz \
--cc=jejb@linux.ibm.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mchehab+samsung@kernel.org \
--cc=ming.lei@redhat.com \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).