* linux-next: manual merge of the block tree with the ide tree
@ 2009-06-09 6:34 Stephen Rothwell
2009-06-09 7:57 ` Borislav Petkov
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2009-06-09 6:34 UTC (permalink / raw)
To: Jens Axboe
Cc: linux-next, linux-kernel, Tejun Heo, Bartlomiej Zolnierkiewicz,
Borislav Petkov, Mark de Wever
[-- Attachment #1: Type: text/plain, Size: 966 bytes --]
Hi Jens,
Today's linux-next merge of the block tree got a conflict in
drivers/ide/ide-tape.c between various commits from the ide tree and
various commits from the block tree.
I fixed it up as best I could (see below).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/ide/ide-tape.c
index 51ea59e,683ff37..0000000
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@@ -610,8 -617,8 +628,8 @@@ static ide_startstop_t idetape_do_reque
struct ide_cmd cmd;
u8 stat;
- debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %lu\n",
- (unsigned long long)rq->sector, rq->nr_sectors);
- debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %u\n"
++ debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %u\n",
+ (unsigned long long)blk_rq_pos(rq), blk_rq_sectors(rq));
if (!(blk_special_request(rq) || blk_sense_request(rq))) {
/* We do not support buffer cache originated requests. */
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the block tree with the ide tree
2009-06-09 6:34 linux-next: manual merge of the block tree with the ide tree Stephen Rothwell
@ 2009-06-09 7:57 ` Borislav Petkov
0 siblings, 0 replies; 3+ messages in thread
From: Borislav Petkov @ 2009-06-09 7:57 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jens Axboe, linux-next, linux-kernel, Tejun Heo,
Bartlomiej Zolnierkiewicz, Borislav Petkov, Mark de Wever
On Tue, Jun 09, 2009 at 04:34:05PM +1000, Stephen Rothwell wrote:
> Hi Jens,
>
> Today's linux-next merge of the block tree got a conflict in
> drivers/ide/ide-tape.c between various commits from the ide tree and
> various commits from the block tree.
>
> I fixed it up as best I could (see below).
Yep, looks good. Thanks.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/ide/ide-tape.c
> index 51ea59e,683ff37..0000000
> --- a/drivers/ide/ide-tape.c
> +++ b/drivers/ide/ide-tape.c
> @@@ -610,8 -617,8 +628,8 @@@ static ide_startstop_t idetape_do_reque
> struct ide_cmd cmd;
> u8 stat;
>
> - debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %lu\n",
> - (unsigned long long)rq->sector, rq->nr_sectors);
> - debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %u\n"
> ++ debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %u\n",
> + (unsigned long long)blk_rq_pos(rq), blk_rq_sectors(rq));
>
> if (!(blk_special_request(rq) || blk_sense_request(rq))) {
> /* We do not support buffer cache originated requests. */
--
Regards/Gruss,
Boris.
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the block tree with the ide tree
@ 2009-06-09 5:09 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2009-06-09 5:09 UTC (permalink / raw)
To: Jens Axboe
Cc: linux-next, linux-kernel, Borislav Petkov,
Bartlomiej Zolnierkiewicz, Tejun Heo
Hi Jens,
Today's linux-next merge of the block tree got a conflict in
drivers/ide/ide-atapi.c between several commit
626542ca2277961aaa64855206574f8ca4f360e3 ("ide-tape: change
IDE_AFLAG_IGNORE_DSC non-atomically") from the ide tree and commit
8f6205cd572fece673da0255d74843680f67f879 ("ide: dequeue in-flight
request") from the block tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/ide/ide-atapi.c
index fbcb851,8a894fa..0000000
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@@ -255,13 -256,22 +256,22 @@@ void ide_retry_pc(ide_drive_t *drive
ide_init_pc(pc);
memcpy(pc->c, sense_rq->cmd, 12);
pc->buf = bio_data(sense_rq->bio); /* pointer to mapped address */
- pc->req_xfer = sense_rq->data_len;
+ pc->req_xfer = blk_rq_bytes(sense_rq);
if (drive->media == ide_tape)
- set_bit(IDE_AFLAG_IGNORE_DSC, &drive->atapi_flags);
+ drive->atapi_flags |= IDE_AFLAG_IGNORE_DSC;
- if (ide_queue_sense_rq(drive, pc))
- ide_complete_rq(drive, -EIO, blk_rq_bytes(drive->hwif->rq));
+ /*
+ * Push back the failed request and put request sense on top
+ * of it. The failed command will be retried after sense data
+ * is acquired.
+ */
+ blk_requeue_request(failed_rq->q, failed_rq);
+ drive->hwif->rq = NULL;
+ if (ide_queue_sense_rq(drive, pc)) {
+ blk_start_request(failed_rq);
+ ide_complete_rq(drive, -EIO, blk_rq_bytes(failed_rq));
+ }
}
EXPORT_SYMBOL_GPL(ide_retry_pc);
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-06-09 7:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-09 6:34 linux-next: manual merge of the block tree with the ide tree Stephen Rothwell
2009-06-09 7:57 ` Borislav Petkov
-- strict thread matches above, loose matches on Subject: below --
2009-06-09 5:09 Stephen Rothwell
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).