Commit 9780e2dd authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe

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: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Cc: Borislav Petkov <petkovbb@googlemail.com>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 83096ebf
...@@ -775,8 +775,8 @@ static ide_startstop_t cdrom_start_rw(ide_drive_t *drive, struct request *rq) ...@@ -775,8 +775,8 @@ static ide_startstop_t cdrom_start_rw(ide_drive_t *drive, struct request *rq)
} }
/* fs requests *must* be hardware frame aligned */ /* fs requests *must* be hardware frame aligned */
if ((rq->nr_sectors & (sectors_per_frame - 1)) || if ((blk_rq_sectors(rq) & (sectors_per_frame - 1)) ||
(rq->sector & (sectors_per_frame - 1))) (blk_rq_pos(rq) & (sectors_per_frame - 1)))
return ide_stopped; return ide_stopped;
/* use DMA, if possible */ /* use DMA, if possible */
...@@ -868,8 +868,8 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq, ...@@ -868,8 +868,8 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
cmd.rq = rq; cmd.rq = rq;
if (blk_fs_request(rq) || rq->data_len) { if (blk_fs_request(rq) || rq->data_len) {
ide_init_sg_cmd(&cmd, blk_fs_request(rq) ? (rq->nr_sectors << 9) ide_init_sg_cmd(&cmd, blk_fs_request(rq) ?
: rq->data_len); (blk_rq_sectors(rq) << 9) : rq->data_len);
ide_map_sg(drive, &cmd); ide_map_sg(drive, &cmd);
} }
......
...@@ -82,7 +82,7 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq, ...@@ -82,7 +82,7 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
sector_t block) sector_t block)
{ {
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
u16 nsectors = (u16)rq->nr_sectors; u16 nsectors = (u16)blk_rq_sectors(rq);
u8 lba48 = !!(drive->dev_flags & IDE_DFLAG_LBA48); u8 lba48 = !!(drive->dev_flags & IDE_DFLAG_LBA48);
u8 dma = !!(drive->dev_flags & IDE_DFLAG_USING_DMA); u8 dma = !!(drive->dev_flags & IDE_DFLAG_USING_DMA);
struct ide_cmd cmd; struct ide_cmd cmd;
...@@ -90,7 +90,7 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq, ...@@ -90,7 +90,7 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
ide_startstop_t rc; ide_startstop_t rc;
if ((hwif->host_flags & IDE_HFLAG_NO_LBA48_DMA) && lba48 && dma) { if ((hwif->host_flags & IDE_HFLAG_NO_LBA48_DMA) && lba48 && dma) {
if (block + rq->nr_sectors > 1ULL << 28) if (block + blk_rq_sectors(rq) > 1ULL << 28)
dma = 0; dma = 0;
else else
lba48 = 0; lba48 = 0;
...@@ -195,9 +195,9 @@ static ide_startstop_t ide_do_rw_disk(ide_drive_t *drive, struct request *rq, ...@@ -195,9 +195,9 @@ static ide_startstop_t ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
ledtrig_ide_activity(); ledtrig_ide_activity();
pr_debug("%s: %sing: block=%llu, sectors=%lu, buffer=0x%08lx\n", pr_debug("%s: %sing: block=%llu, sectors=%u, buffer=0x%08lx\n",
drive->name, rq_data_dir(rq) == READ ? "read" : "writ", drive->name, rq_data_dir(rq) == READ ? "read" : "writ",
(unsigned long long)block, rq->nr_sectors, (unsigned long long)block, blk_rq_sectors(rq),
(unsigned long)rq->buffer); (unsigned long)rq->buffer);
if (hwif->rw_disk) if (hwif->rw_disk)
......
...@@ -103,7 +103,7 @@ ide_startstop_t ide_dma_intr(ide_drive_t *drive) ...@@ -103,7 +103,7 @@ ide_startstop_t ide_dma_intr(ide_drive_t *drive)
ide_finish_cmd(drive, cmd, stat); ide_finish_cmd(drive, cmd, stat);
else else
ide_complete_rq(drive, 0, ide_complete_rq(drive, 0,
cmd->rq->nr_sectors << 9); blk_rq_sectors(cmd->rq) << 9);
return ide_stopped; return ide_stopped;
} }
printk(KERN_ERR "%s: %s: bad DMA status (0x%02x)\n", printk(KERN_ERR "%s: %s: bad DMA status (0x%02x)\n",
......
...@@ -194,7 +194,7 @@ static void idefloppy_create_rw_cmd(ide_drive_t *drive, ...@@ -194,7 +194,7 @@ static void idefloppy_create_rw_cmd(ide_drive_t *drive,
{ {
struct ide_disk_obj *floppy = drive->driver_data; struct ide_disk_obj *floppy = drive->driver_data;
int block = sector / floppy->bs_factor; int block = sector / floppy->bs_factor;
int blocks = rq->nr_sectors / floppy->bs_factor; int blocks = blk_rq_sectors(rq) / floppy->bs_factor;
int cmd = rq_data_dir(rq); int cmd = rq_data_dir(rq);
ide_debug_log(IDE_DBG_FUNC, "block: %d, blocks: %d", block, blocks); ide_debug_log(IDE_DBG_FUNC, "block: %d, blocks: %d", block, blocks);
...@@ -259,8 +259,8 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive, ...@@ -259,8 +259,8 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
goto out_end; goto out_end;
} }
if (blk_fs_request(rq)) { if (blk_fs_request(rq)) {
if (((long)rq->sector % floppy->bs_factor) || if (((long)blk_rq_pos(rq) % floppy->bs_factor) ||
(rq->nr_sectors % floppy->bs_factor)) { (blk_rq_sectors(rq) % floppy->bs_factor)) {
printk(KERN_ERR PFX "%s: unsupported r/w rq size\n", printk(KERN_ERR PFX "%s: unsupported r/w rq size\n",
drive->name); drive->name);
goto out_end; goto out_end;
......
...@@ -279,7 +279,7 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive, ...@@ -279,7 +279,7 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive,
if (cmd) { if (cmd) {
if (cmd->protocol == ATA_PROT_PIO) { if (cmd->protocol == ATA_PROT_PIO) {
ide_init_sg_cmd(cmd, rq->nr_sectors << 9); ide_init_sg_cmd(cmd, blk_rq_sectors(rq) << 9);
ide_map_sg(drive, cmd); ide_map_sg(drive, cmd);
} }
...@@ -387,7 +387,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq) ...@@ -387,7 +387,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
drv = *(struct ide_driver **)rq->rq_disk->private_data; drv = *(struct ide_driver **)rq->rq_disk->private_data;
return drv->do_request(drive, rq, rq->sector); return drv->do_request(drive, rq, blk_rq_pos(rq));
} }
return do_special(drive); return do_special(drive);
kill_rq: kill_rq:
......
...@@ -114,7 +114,7 @@ static void ide_dump_ata_error(ide_drive_t *drive, u8 err) ...@@ -114,7 +114,7 @@ static void ide_dump_ata_error(ide_drive_t *drive, u8 err)
if (rq) if (rq)
printk(KERN_CONT ", sector=%llu", printk(KERN_CONT ", sector=%llu",
(unsigned long long)rq->sector); (unsigned long long)blk_rq_pos(rq));
} }
printk(KERN_CONT "\n"); printk(KERN_CONT "\n");
} }
......
...@@ -586,7 +586,7 @@ static void ide_tape_create_rw_cmd(idetape_tape_t *tape, ...@@ -586,7 +586,7 @@ static void ide_tape_create_rw_cmd(idetape_tape_t *tape,
struct ide_atapi_pc *pc, struct request *rq, struct ide_atapi_pc *pc, struct request *rq,
u8 opcode) u8 opcode)
{ {
unsigned int length = rq->nr_sectors; unsigned int length = blk_rq_sectors(rq);
ide_init_pc(pc); ide_init_pc(pc);
put_unaligned(cpu_to_be32(length), (unsigned int *) &pc->c[1]); 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,8 +617,8 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
struct ide_cmd cmd; struct ide_cmd cmd;
u8 stat; u8 stat;
debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %lu\n" debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %u\n"
(unsigned long long)rq->sector, rq->nr_sectors); (unsigned long long)blk_rq_pos(rq), blk_rq_sectors(rq));
if (!(blk_special_request(rq) || blk_sense_request(rq))) { if (!(blk_special_request(rq) || blk_sense_request(rq))) {
/* We do not support buffer cache originated requests. */ /* We do not support buffer cache originated requests. */
......
...@@ -385,7 +385,7 @@ static ide_startstop_t task_pio_intr(ide_drive_t *drive) ...@@ -385,7 +385,7 @@ static ide_startstop_t task_pio_intr(ide_drive_t *drive)
if ((cmd->tf_flags & IDE_TFLAG_FS) == 0) if ((cmd->tf_flags & IDE_TFLAG_FS) == 0)
ide_finish_cmd(drive, cmd, stat); ide_finish_cmd(drive, cmd, stat);
else else
ide_complete_rq(drive, 0, cmd->rq->nr_sectors << 9); ide_complete_rq(drive, 0, blk_rq_sectors(cmd->rq) << 9);
return ide_stopped; return ide_stopped;
out_err: out_err:
ide_error_cmd(drive, cmd); ide_error_cmd(drive, cmd);
......
...@@ -177,7 +177,7 @@ static void pdc202xx_dma_start(ide_drive_t *drive) ...@@ -177,7 +177,7 @@ static void pdc202xx_dma_start(ide_drive_t *drive)
u8 clock = inb(high_16 + 0x11); u8 clock = inb(high_16 + 0x11);
outb(clock | (hwif->channel ? 0x08 : 0x02), high_16 + 0x11); outb(clock | (hwif->channel ? 0x08 : 0x02), high_16 + 0x11);
word_count = (rq->nr_sectors << 8); word_count = (blk_rq_sectors(rq) << 8);
word_count = (rq_data_dir(rq) == READ) ? word_count = (rq_data_dir(rq) == READ) ?
word_count | 0x05000000 : word_count | 0x05000000 :
word_count | 0x06000000; word_count | 0x06000000;
......
...@@ -112,7 +112,7 @@ static void tc86c001_dma_start(ide_drive_t *drive) ...@@ -112,7 +112,7 @@ static void tc86c001_dma_start(ide_drive_t *drive)
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
unsigned long sc_base = hwif->config_data; unsigned long sc_base = hwif->config_data;
unsigned long twcr_port = sc_base + (drive->dn ? 0x06 : 0x04); unsigned long twcr_port = sc_base + (drive->dn ? 0x06 : 0x04);
unsigned long nsectors = hwif->rq->nr_sectors; unsigned long nsectors = blk_rq_sectors(hwif->rq);
/* /*
* We have to manually load the sector count and size into * We have to manually load the sector count and size into
......
...@@ -307,7 +307,7 @@ static int tx4939ide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd) ...@@ -307,7 +307,7 @@ static int tx4939ide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
tx4939ide_writew(SECTOR_SIZE / 2, base, drive->dn ? tx4939ide_writew(SECTOR_SIZE / 2, base, drive->dn ?
TX4939IDE_Xfer_Cnt_2 : TX4939IDE_Xfer_Cnt_1); TX4939IDE_Xfer_Cnt_2 : TX4939IDE_Xfer_Cnt_1);
tx4939ide_writew(cmd->rq->nr_sectors, base, TX4939IDE_Sec_Cnt); tx4939ide_writew(blk_rq_sectors(cmd->rq), base, TX4939IDE_Sec_Cnt);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment