From patchwork Tue Nov 26 19:54:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Michal_Such=C3=A1nek?= X-Patchwork-Id: 11263023 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 DABD3930 for ; Tue, 26 Nov 2019 19:55:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C1DE220866 for ; Tue, 26 Nov 2019 19:55:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726970AbfKZTyn (ORCPT ); Tue, 26 Nov 2019 14:54:43 -0500 Received: from mx2.suse.de ([195.135.220.15]:40240 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725970AbfKZTyn (ORCPT ); Tue, 26 Nov 2019 14:54:43 -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 A0A04B01C; Tue, 26 Nov 2019 19:54:40 +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 rebase 03/10] cdrom: wait for the tray to close Date: Tue, 26 Nov 2019 20:54:22 +0100 Message-Id: X-Mailer: git-send-email 2.23.0 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org The scsi command to close the tray only starts the motor and does not wait for the tray to close. Wait until the state chages from TRAY_OPEN so users do not race with the tray closing. This looks like inifinte wait but unless the drive is broken it either closes the tray shortly or reports an error when it detects the tray is blocked. At worst the wait can be interrupted by the user. Also wait for the drive to become ready once the tray closes. Signed-off-by: Michal Suchanek --- v2: - check drive_status exists before using it - rename tray_close -> cdrom_tray_close - also wait for drive to become ready after tray closes - do not wait in cdrom_ioctl_closetray v4: add a status change poll wrapper --- drivers/cdrom/cdrom.c | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index bb32decdadf1..b2bc0c8f9a69 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c @@ -1045,6 +1045,28 @@ static void cdrom_count_tracks(struct cdrom_device_info *cdi, tracktype *tracks) tracks->cdi, tracks->xa); } +static int cdrom_wait_for_status_change(struct cdrom_device_info *cdi, + int *status) +{ + int saved = *status; + const struct cdrom_device_ops *cdo = cdi->ops; + + return poll_event_interruptible(saved != + (*status = cdo->drive_status(cdi, CDSL_CURRENT)), 500); +} + +static int cdrom_tray_close(struct cdrom_device_info *cdi) +{ + int ret; + + ret = cdi->ops->tray_move(cdi, 0); + if (ret || !cdi->ops->drive_status) + return ret; + + ret = CDS_TRAY_OPEN; + return cdrom_wait_for_status_change(cdi, &ret); +} + static int open_for_common(struct cdrom_device_info *cdi, tracktype *tracks) { int ret; @@ -1062,14 +1084,14 @@ static int open_for_common(struct cdrom_device_info *cdi, tracktype *tracks) if (!(cdi->options & CDO_AUTO_CLOSE)) return -ENOMEDIUM; cd_dbg(CD_OPEN, "trying to close the tray\n"); - ret=cdo->tray_move(cdi,0); + ret = cdrom_tray_close(cdi); + if (ret == -ERESTARTSYS) + return ret; if (ret) { cd_dbg(CD_OPEN, "bummer. tried to close the tray but failed.\n"); return -ENOMEDIUM; } ret = cdo->drive_status(cdi, CDSL_CURRENT); - if (ret == CDS_TRAY_OPEN) - cd_dbg(CD_OPEN, "bummer. the tray is still not closed.\n"); if (ret == CDS_NO_DISC) cd_dbg(CD_OPEN, "tray might not contain a medium\n"); } else { @@ -1077,6 +1099,14 @@ static int open_for_common(struct cdrom_device_info *cdi, tracktype *tracks) return -ENOMEDIUM; } } + if (ret == CDS_DRIVE_NOT_READY) { + int poll_res; + + cd_dbg(CD_OPEN, "waiting for drive to become ready...\n"); + poll_res = cdrom_wait_for_status_change(cdi, &ret); + if (poll_res == -ERESTARTSYS) + return poll_res; + } if (ret != CDS_DISC_OK) return -ENOMEDIUM; }