From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: ManYi Li <limanyi@uniontech.com>,
"Martin K . Petersen" <martin.petersen@oracle.com>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.4 2/6] scsi: sr: Return appropriate error code when disk is ejected
Date: Mon, 5 Jul 2021 07:00:25 -0400 [thread overview]
Message-ID: <20210705110029.1513384-3-sashal@kernel.org> (raw)
In-Reply-To: <20210705110029.1513384-1-sashal@kernel.org>
From: ManYi Li <limanyi@uniontech.com>
[ 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 <limanyi@uniontech.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/scsi/sr.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 70a28f6fb1d0..2332b245b182 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -218,6 +218,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
next prev parent reply other threads:[~2021-07-05 11:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-05 11:00 [PATCH 5.4 0/6] 5.4.130-rc1 review Sasha Levin
2021-07-05 11:00 ` [PATCH 5.4 1/6] x86/efi: remove unused variables Sasha Levin
2021-07-05 11:00 ` Sasha Levin [this message]
2021-07-05 11:00 ` [PATCH 5.4 3/6] drm/nouveau: fix dma_address check for CPU/GPU sync Sasha Levin
2021-07-05 11:00 ` [PATCH 5.4 4/6] gpio: AMD8111 and TQMX86 require HAS_IOPORT_MAP Sasha Levin
2021-07-05 11:00 ` [PATCH 5.4 5/6] RDMA/mlx5: Block FDB rules when not in switchdev mode Sasha Levin
2021-07-05 11:00 ` [PATCH 5.4 6/6] Linux 5.4.130-rc1 Sasha Levin
2021-07-05 20:38 ` [PATCH 5.4 0/6] 5.4.130-rc1 review Guenter Roeck
2021-07-06 5:05 ` Naresh Kamboju
2021-07-06 6:08 ` Samuel Zou
2021-07-06 15:13 ` Sudip Mukherjee
2021-07-06 22:44 ` Shuah Khan
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=20210705110029.1513384-3-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=limanyi@uniontech.com \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=stable@vger.kernel.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