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 10/10] scsi: sr: wait for the medium to become ready
Date: Tue, 26 Nov 2019 20:54:29 +0100 [thread overview]
Message-ID: <16e56013bf54485a98af855deddb660ade2136b8.1574797504.git.msuchanek@suse.de> (raw)
In-Reply-To: <cover.1574797504.git.msuchanek@suse.de>
Use the autoclose function provided by cdrom driver to wait for drive to
close in open_finish, and attempt to open once more after the door
closes.
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
v3: use function call rather than IOCTL
v4: fix reference leak on -ENXIO
---
drivers/scsi/sr.c | 54 ++++++++++++++++++++++++++++++++++++-----------
1 file changed, 42 insertions(+), 12 deletions(-)
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 07c319494bf4..41ddf08b4c7b 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -522,29 +522,58 @@ static blk_status_t sr_init_command(struct scsi_cmnd *SCpnt)
return ret;
}
-static int sr_block_open(struct block_device *bdev, fmode_t mode)
+static int __sr_block_open(struct block_device *bdev, fmode_t mode)
{
- struct scsi_cd *cd;
- struct scsi_device *sdev;
- int ret = -ENXIO;
-
- cd = scsi_cd_get(bdev->bd_disk);
- if (!cd)
- goto out;
+ struct scsi_cd *cd = scsi_cd(bdev->bd_disk);
+ int ret;
- sdev = cd->device;
- scsi_autopm_get_device(sdev);
check_disk_change(bdev);
mutex_lock(&sr_mutex);
ret = cdrom_open(&cd->cdi, bdev, mode);
mutex_unlock(&sr_mutex);
+ return ret;
+}
+
+static int sr_block_open(struct block_device *bdev, fmode_t mode)
+{
+ struct scsi_cd *cd = scsi_cd_get(bdev->bd_disk);
+ struct scsi_device *sdev;
+ int ret;
+
+ if (!cd)
+ return -ENXIO;
+
+ sdev = cd->device;
+ scsi_autopm_get_device(sdev);
+ ret = __sr_block_open(bdev, mode);
scsi_autopm_put_device(sdev);
- if (ret)
+
+ if ((ret == -ERESTARTSYS) || (ret == -ENXIO))
scsi_cd_put(cd);
-out:
+ return ret;
+}
+
+static int sr_block_open_finish(struct block_device *bdev, fmode_t mode,
+ int ret)
+{
+ struct scsi_cd *cd = scsi_cd(bdev->bd_disk);
+
+ /* wait for drive to get ready */
+ if ((ret == -ENOMEDIUM) && !(mode & FMODE_NDELAY)) {
+ struct scsi_device *sdev = cd->device;
+ /*
+ * Cannot use sr_block_ioctl because it locks sr_mutex blocking
+ * out any processes trying to access the drive
+ */
+ scsi_autopm_get_device(sdev);
+ cdrom_autoclose(&cd->cdi);
+ ret = __sr_block_open(bdev, mode);
+ scsi_autopm_put_device(sdev);
+ }
+
return ret;
}
@@ -640,6 +669,7 @@ static const struct block_device_operations sr_bdops =
{
.owner = THIS_MODULE,
.open = sr_block_open,
+ .open_finish = sr_block_open_finish,
.release = sr_block_release,
.ioctl = sr_block_ioctl,
.check_events = sr_block_check_events,
--
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 ` [PATCH v4 rebase 07/10] bdev: separate parts of __blkdev_get as helper functions Michal Suchanek
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 ` Michal Suchanek [this message]
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=16e56013bf54485a98af855deddb660ade2136b8.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).