ide: keep track of number of bytes instead of sectors in struct ide_cmd

* Pass number of bytes instead of sectors to ide_init_sg_cmd().

* Pass number of bytes to process to ide_pio_sector() and rename
  it to ide_pio_bytes().

* Rename ->nsect field to ->nbytes in struct ide_cmd and use
  ->nbytes, ->nleft and ->cursg_ofs to keep track of number of
  bytes instead of sectors.

There should be no functional changes caused by this patch.

Acked-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 4b32c4eb7b82f8a890d7f2d684881466a1bcf682..ca934c8a12891c68ea29815b99d4e92fef408efd 100644 (file)
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -152,7 +152,7 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
        cmd.rq = rq;
 
        if (dma == 0) {
-               ide_init_sg_cmd(&cmd, nsectors);
+               ide_init_sg_cmd(&cmd, nsectors << 9);
                ide_map_sg(drive, &cmd);
        }
 
@@ -162,7 +162,7 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
                /* fallback to PIO */
                cmd.tf_flags |= IDE_TFLAG_DMA_PIO_FALLBACK;
                ide_tf_set_cmd(drive, &cmd, 0);
-               ide_init_sg_cmd(&cmd, nsectors);
+               ide_init_sg_cmd(&cmd, nsectors << 9);
                rc = do_rw_taskfile(drive, &cmd);
        }
 

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index f3ed5de3141b9a8c9f3183633357e7194ea853f3..7ae66233483519ac52cc0921f0b2c61229c6153c 100644 (file)
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -294,7 +294,7 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
        cmd.rq = rq;
 
        if (blk_fs_request(rq) || pc->req_xfer) {
-               ide_init_sg_cmd(&cmd, rq->nr_sectors);
+               ide_init_sg_cmd(&cmd, rq->nr_sectors << 9);
                ide_map_sg(drive, &cmd);
        }
 

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index b4901b690c9a8473f1bd4bf8920536d3067cd9fd..1adc5e2e7fb3e859e91b7008cc5b9f215e53f020 100644 (file)
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -245,9 +245,9 @@ void ide_map_sg(ide_drive_t *drive, struct ide_cmd *cmd)
 }
 EXPORT_SYMBOL_GPL(ide_map_sg);
 
-void ide_init_sg_cmd(struct ide_cmd *cmd, int nsect)
+void ide_init_sg_cmd(struct ide_cmd *cmd, unsigned int nr_bytes)
 {
-       cmd->nsect = cmd->nleft = nsect;
+       cmd->nbytes = cmd->nleft = nr_bytes;
        cmd->cursg_ofs = 0;
        cmd->cursg = NULL;
 }
@@ -272,7 +272,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);
+                       ide_init_sg_cmd(cmd, rq->nr_sectors << 9);
                        ide_map_sg(drive, cmd);
                }
 

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 329fd6f13f797f35fe370b18a836630b48e1a18b..84532be97c006081aa5f1fea3ca85562e8b6f1f6 100644 (file)
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -188,8 +188,8 @@ static u8 wait_drive_not_busy(ide_drive_t *drive)
        return stat;
 }
 
-static void ide_pio_sector(ide_drive_t *drive, struct ide_cmd *cmd,
-                          unsigned int write)
+static void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
+                         unsigned int write, unsigned int nr_bytes)
 {
        ide_hwif_t *hwif = drive->hwif;
        struct scatterlist *sg = hwif->sg_table;
@@ -208,7 +208,7 @@ static void ide_pio_sector(ide_drive_t *drive, struct ide_cmd *cmd,
        }
 
        page = sg_page(cursg);
-       offset = cursg->offset + cmd->cursg_ofs * SECTOR_SIZE;
+       offset = cursg->offset + cmd->cursg_ofs;
 
        /* get the current page and offset */
        page = nth_page(page, (offset >> PAGE_SHIFT));
@@ -219,19 +219,19 @@ static void ide_pio_sector(ide_drive_t *drive, struct ide_cmd *cmd,
 #endif
        buf = kmap_atomic(page, KM_BIO_SRC_IRQ) + offset;
 
-       cmd->nleft--;
-       cmd->cursg_ofs++;
+       cmd->nleft -= nr_bytes;
+       cmd->cursg_ofs += nr_bytes;
 
-       if ((cmd->cursg_ofs * SECTOR_SIZE) == cursg->length) {
+       if (cmd->cursg_ofs == cursg->length) {
                cmd->cursg = sg_next(cmd->cursg);
                cmd->cursg_ofs = 0;
        }
 
        /* do the actual data transfer */
        if (write)
-               hwif->tp_ops->output_data(drive, cmd, buf, SECTOR_SIZE);
+               hwif->tp_ops->output_data(drive, cmd, buf, nr_bytes);
        else
-               hwif->tp_ops->input_data(drive, cmd, buf, SECTOR_SIZE);
+               hwif->tp_ops->input_data(drive, cmd, buf, nr_bytes);
 
        kunmap_atomic(buf, KM_BIO_SRC_IRQ);
 #ifdef CONFIG_HIGHMEM
@@ -244,9 +244,9 @@ static void ide_pio_multi(ide_drive_t *drive, struct ide_cmd *cmd,
 {
        unsigned int nsect;
 
-       nsect = min_t(unsigned int, cmd->nleft, drive->mult_count);
+       nsect = min_t(unsigned int, cmd->nleft >> 9, drive->mult_count);
        while (nsect--)
-               ide_pio_sector(drive, cmd, write);
+               ide_pio_bytes(drive, cmd, write, SECTOR_SIZE);
 }
 
 static void ide_pio_datablock(ide_drive_t *drive, struct ide_cmd *cmd,
@@ -265,7 +265,7 @@ static void ide_pio_datablock(ide_drive_t *drive, struct ide_cmd *cmd,
        if (cmd->tf_flags & IDE_TFLAG_MULTI_PIO)
                ide_pio_multi(drive, cmd, write);
        else
-               ide_pio_sector(drive, cmd, write);
+               ide_pio_bytes(drive, cmd, write, SECTOR_SIZE);
 
        drive->io_32bit = saved_io_32bit;
 }
@@ -273,18 +273,18 @@ static void ide_pio_datablock(ide_drive_t *drive, struct ide_cmd *cmd,
 static void ide_error_cmd(ide_drive_t *drive, struct ide_cmd *cmd)
 {
        if (cmd->tf_flags & IDE_TFLAG_FS) {
-               int sectors = cmd->nsect - cmd->nleft;
+               int nr_bytes = cmd->nbytes - cmd->nleft;
 
                if (cmd->protocol == ATA_PROT_PIO &&
                    ((cmd->tf_flags & IDE_TFLAG_WRITE) || cmd->nleft == 0)) {
                        if (cmd->tf_flags & IDE_TFLAG_MULTI_PIO)
-                               sectors -= drive->mult_count;
+                               nr_bytes -= drive->mult_count << 9;
                        else
-                               sectors--;
+                               nr_bytes -= SECTOR_SIZE;
                }
 
-               if (sectors > 0)
-                       ide_complete_rq(drive, 0, sectors << 9);
+               if (nr_bytes > 0)
+                       ide_complete_rq(drive, 0, nr_bytes);
        }
 }
 

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 2d0c7afd5e586229cb4da8e01ac876fb6c4f675d..d5d832271f44255c8ae406d86ade64f7da7378a8 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -350,7 +350,7 @@ struct ide_cmd {
        int                     orig_sg_nents;
        int                     sg_dma_direction; /* DMA transfer direction */
 
-       unsigned int            nsect;
+       unsigned int            nbytes;
        unsigned int            nleft;
        struct scatterlist      *cursg;
        unsigned int            cursg_ofs;
@@ -1409,7 +1409,7 @@ int ide_pci_resume(struct pci_dev *);
 #endif
 
 void ide_map_sg(ide_drive_t *, struct ide_cmd *);
-void ide_init_sg_cmd(struct ide_cmd *, int);
+void ide_init_sg_cmd(struct ide_cmd *, unsigned int);
 
 #define BAD_DMA_DRIVE          0
 #define GOOD_DMA_DRIVE         1