From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F19F0C07E9C for ; Mon, 5 Jul 2021 10:59:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DDF356142F for ; Mon, 5 Jul 2021 10:59:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231277AbhGELCR (ORCPT ); Mon, 5 Jul 2021 07:02:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:47182 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231184AbhGELCO (ORCPT ); Mon, 5 Jul 2021 07:02:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 013156142F; Mon, 5 Jul 2021 10:59:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625482777; bh=YCXtV/pR9YFL5eLGNB9mKwdY0EYLoXZSs9y4rTOPIAc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iSPX5mBYUquN7pzEUjsp+fH1LKFNKG3WfP1lesTBsGYbTYn8i8+PxPnBllP0DmFTy NFsv2h1AdfT7/bhON64dOPXio9fxncxUwMeyJw54MnoG93kB0DpntcgSiixbzPNmR+ jr/tkk7Oz7uhYNLqzGAzXqHvN0Z3ia6zHZ6YJfHZKrSxtSrgT7LnSCtdVzzLnlqr2M v1y+7I0q3pneZBR024GHf4aTAizdd2kLNOzTK9HIduczP6/AwI8P6cpf+Fwm/Lpgcj UWAS2SMnT+Z21n+OFyYTFooPzuqR81vDaf0kkG+eWb4812boCLhf2/VhQ1gQL36rdp ncLo4gw+gYTow== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: ManYi Li , "Martin K . Petersen" , Sasha Levin Subject: [PATCH 5.12 1/7] scsi: sr: Return appropriate error code when disk is ejected Date: Mon, 5 Jul 2021 06:59:28 -0400 Message-Id: <20210705105934.1513188-2-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210705105934.1513188-1-sashal@kernel.org> References: <20210705105934.1513188-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.12.15-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.12.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.12.15-rc1 X-KernelTest-Deadline: 2021-07-07T10:59+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: ManYi Li [ Upstream commit 7dd753ca59d6c8cc09aa1ed24f7657524803c7f3 ] Handle a reported media event code of 3. This indicates that the media has been removed from the drive and user intervention is required to proceed. Return DISK_EVENT_EJECT_REQUEST in that case. Link: https://lore.kernel.org/r/20210611094402.23884-1-limanyi@uniontech.com Signed-off-by: ManYi Li Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/sr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index e4633b84c556..7815ed642d43 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -220,6 +220,8 @@ static unsigned int sr_get_events(struct scsi_device *sdev) return DISK_EVENT_EJECT_REQUEST; else if (med->media_event_code == 2) return DISK_EVENT_MEDIA_CHANGE; + else if (med->media_event_code == 3) + return DISK_EVENT_EJECT_REQUEST; return 0; } -- 2.30.2