From: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
To: jejb@linux.vnet.ibm.com
Cc: brking@linux.vnet.ibm.com, linux-scsi@vger.kernel.org,
Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
Subject: [PATCH 2/2] sr: Drop custom handling of unit attention
Date: Wed, 12 Oct 2016 02:25:21 -0300 [thread overview]
Message-ID: <1476249921-17017-2-git-send-email-krisman@linux.vnet.ibm.com> (raw)
In-Reply-To: <1476249921-17017-1-git-send-email-krisman@linux.vnet.ibm.com>
This is no longer necessary, since we handle it in scsi_execute.
Signed-off-by: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
---
drivers/scsi/sr_ioctl.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
index 03054c0e7689..f7724e52fd0f 100644
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
@@ -179,8 +179,7 @@ static int sr_play_trkind(struct cdrom_device_info *cdi,
}
/* We do our own retries because we want to know what the specific
- error code is. Normally the UNIT_ATTENTION code will automatically
- clear after one error */
+ error code is. */
int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
{
@@ -220,8 +219,6 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
if (!cgc->quiet)
sr_printk(KERN_INFO, cd,
"disc change detected.\n");
- if (retries++ < 10)
- goto retry;
err = -ENOMEDIUM;
break;
case NOT_READY: /* This happens if there is no disc in drive */
--
2.7.4
next prev parent reply other threads:[~2016-10-12 5:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-12 5:25 [PATCH 1/2] scsi: Handle Unit Attention when issuing SCSI command Gabriel Krisman Bertazi
2016-10-12 5:25 ` Gabriel Krisman Bertazi [this message]
2016-10-12 13:15 ` James Bottomley
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=1476249921-17017-2-git-send-email-krisman@linux.vnet.ibm.com \
--to=krisman@linux.vnet.ibm.com \
--cc=brking@linux.vnet.ibm.com \
--cc=jejb@linux.vnet.ibm.com \
--cc=linux-scsi@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;
as well as URLs for NNTP newsgroup(s).