Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/ide/ide-cd.c

+4 −4
Original line number Diff line number Diff line
@@ -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 */

	if ((rq->nr_sectors & (sectors_per_frame - 1)) ||

	    (rq->sector & (sectors_per_frame - 1)))

	if ((blk_rq_sectors(rq) & (sectors_per_frame - 1)) ||

	    (blk_rq_pos(rq) & (sectors_per_frame - 1)))

		return ide_stopped;



	/* use DMA, if possible */
@@ -868,8 +868,8 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq, 
	cmd.rq = rq;



	if (blk_fs_request(rq) || rq->data_len) {

		ide_init_sg_cmd(&cmd, blk_fs_request(rq) ? (rq->nr_sectors << 9)

							 : rq->data_len);

		ide_init_sg_cmd(&cmd, blk_fs_request(rq) ?

				(blk_rq_sectors(rq) << 9) : rq->data_len);

		ide_map_sg(drive, &cmd);

	}

drivers/ide/ide-disk.c

+4 −4
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq, 
					sector_t block)

{

	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 dma			= !!(drive->dev_flags & IDE_DFLAG_USING_DMA);

	struct ide_cmd		cmd;
@@ -90,7 +90,7 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq, 
	ide_startstop_t		rc;



	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;

		else

			lba48 = 0;
@@ -195,9 +195,9 @@ static ide_startstop_t ide_do_rw_disk(ide_drive_t *drive, struct request *rq, 


	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",

		 (unsigned long long)block, rq->nr_sectors,

		 (unsigned long long)block, blk_rq_sectors(rq),

		 (unsigned long)rq->buffer);



	if (hwif->rw_disk)

drivers/ide/ide-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ ide_startstop_t ide_dma_intr(ide_drive_t *drive) 
				ide_finish_cmd(drive, cmd, stat);

			else

				ide_complete_rq(drive, 0,

						cmd->rq->nr_sectors << 9);

						blk_rq_sectors(cmd->rq) << 9);

			return ide_stopped;

		}

		printk(KERN_ERR "%s: %s: bad DMA status (0x%02x)\n",

drivers/ide/ide-floppy.c

+3 −3
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static void idefloppy_create_rw_cmd(ide_drive_t *drive, 
{

	struct ide_disk_obj *floppy = drive->driver_data;

	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);



	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, 
			goto out_end;

	}

	if (blk_fs_request(rq)) {

		if (((long)rq->sector % floppy->bs_factor) ||

		    (rq->nr_sectors % floppy->bs_factor)) {

		if (((long)blk_rq_pos(rq) % floppy->bs_factor) ||

		    (blk_rq_sectors(rq) % floppy->bs_factor)) {

			printk(KERN_ERR PFX "%s: unsupported r/w rq size\n",

				drive->name);

			goto out_end;

drivers/ide/ide-io.c

+2 −2
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive, 


	if (cmd) {

		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);

		}
@@ -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;



		return drv->do_request(drive, rq, rq->sector);

		return drv->do_request(drive, rq, blk_rq_pos(rq));

	}

	return do_special(drive);

kill_rq: