* [PATCH] IDE update for 2.6.7-rc3 [7/12]
@ 2004-06-11 15:59 Bartlomiej Zolnierkiewicz
2004-06-11 16:45 ` Jens Axboe
0 siblings, 1 reply; 3+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2004-06-11 15:59 UTC (permalink / raw)
To: linux-ide; +Cc: linux-kernel, Jens Axboe
[PATCH] ide: fix ide-cd to not retry REQ_DRIVE_TASKFILE requests
'cat /proc/ide/hdx/identify' generates REQ_DRIVE_TASKFILE request
(for WIN_PIDENTIFY command) even for devices controlled by ide-cd.
All other drivers don't retry such requests.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
linux-2.6.7-rc3-bzolnier/drivers/ide/ide-cd.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/ide/ide-cd.c~ide_cdrom_taskfile drivers/ide/ide-cd.c
--- linux-2.6.7-rc3/drivers/ide/ide-cd.c~ide_cdrom_taskfile 2004-06-10 23:01:31.725338592 +0200
+++ linux-2.6.7-rc3-bzolnier/drivers/ide/ide-cd.c 2004-06-10 23:01:31.731337680 +0200
@@ -574,7 +574,7 @@ ide_startstop_t ide_cdrom_error (ide_dri
if (drive == NULL || (rq = HWGROUP(drive)->rq) == NULL)
return ide_stopped;
/* retry only "normal" I/O: */
- if (rq->flags & (REQ_DRIVE_CMD | REQ_DRIVE_TASK)) {
+ if (rq->flags & (REQ_DRIVE_CMD | REQ_DRIVE_TASK | REQ_DRIVE_TASKFILE)) {
rq->errors = 1;
ide_end_drive_cmd(drive, stat, err);
return ide_stopped;
_
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] IDE update for 2.6.7-rc3 [7/12]
2004-06-11 15:59 [PATCH] IDE update for 2.6.7-rc3 [7/12] Bartlomiej Zolnierkiewicz
@ 2004-06-11 16:45 ` Jens Axboe
2004-06-11 17:55 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 3+ messages in thread
From: Jens Axboe @ 2004-06-11 16:45 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: linux-ide, linux-kernel
On Fri, Jun 11 2004, Bartlomiej Zolnierkiewicz wrote:
>
> [PATCH] ide: fix ide-cd to not retry REQ_DRIVE_TASKFILE requests
>
> 'cat /proc/ide/hdx/identify' generates REQ_DRIVE_TASKFILE request
> (for WIN_PIDENTIFY command) even for devices controlled by ide-cd.
>
> All other drivers don't retry such requests.
>
> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
>
> linux-2.6.7-rc3-bzolnier/drivers/ide/ide-cd.c | 2 +-
> 1 files changed, 1 insertion(+), 1 deletion(-)
>
> diff -puN drivers/ide/ide-cd.c~ide_cdrom_taskfile drivers/ide/ide-cd.c
> --- linux-2.6.7-rc3/drivers/ide/ide-cd.c~ide_cdrom_taskfile 2004-06-10 23:01:31.725338592 +0200
> +++ linux-2.6.7-rc3-bzolnier/drivers/ide/ide-cd.c 2004-06-10 23:01:31.731337680 +0200
> @@ -574,7 +574,7 @@ ide_startstop_t ide_cdrom_error (ide_dri
> if (drive == NULL || (rq = HWGROUP(drive)->rq) == NULL)
> return ide_stopped;
> /* retry only "normal" I/O: */
> - if (rq->flags & (REQ_DRIVE_CMD | REQ_DRIVE_TASK)) {
> + if (rq->flags & (REQ_DRIVE_CMD | REQ_DRIVE_TASK | REQ_DRIVE_TASKFILE)) {
> rq->errors = 1;
> ide_end_drive_cmd(drive, stat, err);
> return ide_stopped;
Was wondering whether it was clearer to use !blk_fs_request() instead,
but that would need looking at REQ_PC and REQ_BLOCK_PC. So for now the
above is fine with me, if you include ide_cdrom_abort() as well.
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] IDE update for 2.6.7-rc3 [7/12]
2004-06-11 16:45 ` Jens Axboe
@ 2004-06-11 17:55 ` Bartlomiej Zolnierkiewicz
0 siblings, 0 replies; 3+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2004-06-11 17:55 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-ide, linux-kernel
On Friday 11 of June 2004 18:45, Jens Axboe wrote:
> On Fri, Jun 11 2004, Bartlomiej Zolnierkiewicz wrote:
> > [PATCH] ide: fix ide-cd to not retry REQ_DRIVE_TASKFILE requests
> >
> > 'cat /proc/ide/hdx/identify' generates REQ_DRIVE_TASKFILE request
> > (for WIN_PIDENTIFY command) even for devices controlled by ide-cd.
> >
> > All other drivers don't retry such requests.
> >
> > Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
> >
> > linux-2.6.7-rc3-bzolnier/drivers/ide/ide-cd.c | 2 +-
> > 1 files changed, 1 insertion(+), 1 deletion(-)
> >
> > diff -puN drivers/ide/ide-cd.c~ide_cdrom_taskfile drivers/ide/ide-cd.c
> > --- linux-2.6.7-rc3/drivers/ide/ide-cd.c~ide_cdrom_taskfile 2004-06-10
> > 23:01:31.725338592 +0200 +++
> > linux-2.6.7-rc3-bzolnier/drivers/ide/ide-cd.c 2004-06-10
> > 23:01:31.731337680 +0200 @@ -574,7 +574,7 @@ ide_startstop_t
> > ide_cdrom_error (ide_dri
> > if (drive == NULL || (rq = HWGROUP(drive)->rq) == NULL)
> > return ide_stopped;
> > /* retry only "normal" I/O: */
> > - if (rq->flags & (REQ_DRIVE_CMD | REQ_DRIVE_TASK)) {
> > + if (rq->flags & (REQ_DRIVE_CMD | REQ_DRIVE_TASK | REQ_DRIVE_TASKFILE))
> > { rq->errors = 1;
> > ide_end_drive_cmd(drive, stat, err);
> > return ide_stopped;
>
> Was wondering whether it was clearer to use !blk_fs_request() instead,
> but that would need looking at REQ_PC and REQ_BLOCK_PC. So for now the
> above is fine with me, if you include ide_cdrom_abort() as well.
OK, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2004-06-11 17:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-06-11 15:59 [PATCH] IDE update for 2.6.7-rc3 [7/12] Bartlomiej Zolnierkiewicz
2004-06-11 16:45 ` Jens Axboe
2004-06-11 17:55 ` Bartlomiej Zolnierkiewicz
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).