diff options
author | Tejun Heo <tj@kernel.org> | 2009-05-07 09:24:40 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-05-11 03:50:54 -0400 |
commit | 9780e2dd8254351f6cbe11304849126b51dbd561 (patch) | |
tree | a987a9d671302f4a5133cbf1d7880158a9f21315 /drivers/ide/ide-tape.c | |
parent | 83096ebf1263b2c1ee5e653ba37d993d02e3eb7b (diff) |
ide: convert to rq pos and nr_sectors accessors
ide doesn't manipulate request fields anymore and thus all hard and
their soft equivalents are always equal. Convert all references to
accessors.
[ Impact: use pos and nr_sectors accessors ]
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Cc: Borislav Petkov <petkovbb@googlemail.com>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/ide/ide-tape.c')
-rw-r--r-- | drivers/ide/ide-tape.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index 65c5b705883a..c6cf3a951f28 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c | |||
@@ -586,7 +586,7 @@ static void ide_tape_create_rw_cmd(idetape_tape_t *tape, | |||
586 | struct ide_atapi_pc *pc, struct request *rq, | 586 | struct ide_atapi_pc *pc, struct request *rq, |
587 | u8 opcode) | 587 | u8 opcode) |
588 | { | 588 | { |
589 | unsigned int length = rq->nr_sectors; | 589 | unsigned int length = blk_rq_sectors(rq); |
590 | 590 | ||
591 | ide_init_pc(pc); | 591 | ide_init_pc(pc); |
592 | put_unaligned(cpu_to_be32(length), (unsigned int *) &pc->c[1]); | 592 | put_unaligned(cpu_to_be32(length), (unsigned int *) &pc->c[1]); |
@@ -617,8 +617,8 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive, | |||
617 | struct ide_cmd cmd; | 617 | struct ide_cmd cmd; |
618 | u8 stat; | 618 | u8 stat; |
619 | 619 | ||
620 | debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %lu\n" | 620 | debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %u\n" |
621 | (unsigned long long)rq->sector, rq->nr_sectors); | 621 | (unsigned long long)blk_rq_pos(rq), blk_rq_sectors(rq)); |
622 | 622 | ||
623 | if (!(blk_special_request(rq) || blk_sense_request(rq))) { | 623 | if (!(blk_special_request(rq) || blk_sense_request(rq))) { |
624 | /* We do not support buffer cache originated requests. */ | 624 | /* We do not support buffer cache originated requests. */ |