ide: pass number of bytes to complete to ide_complete_rq()

There should be no functional changes caused by this patch.
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent a9587fd8
...@@ -404,7 +404,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive) ...@@ -404,7 +404,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
if (blk_special_request(rq)) { if (blk_special_request(rq)) {
rq->errors = 0; rq->errors = 0;
ide_complete_rq(drive, 0); ide_complete_rq(drive, 0, blk_rq_bytes(rq));
} else { } else {
if (blk_fs_request(rq) == 0 && uptodate <= 0) { if (blk_fs_request(rq) == 0 && uptodate <= 0) {
if (rq->errors == 0) if (rq->errors == 0)
......
...@@ -134,7 +134,7 @@ ide_startstop_t ide_error(ide_drive_t *drive, const char *msg, u8 stat) ...@@ -134,7 +134,7 @@ ide_startstop_t ide_error(ide_drive_t *drive, const char *msg, u8 stat)
return ide_stopped; return ide_stopped;
} }
rq->errors = err; rq->errors = err;
ide_complete_rq(drive, err ? -EIO : 0); ide_complete_rq(drive, err ? -EIO : 0, blk_rq_bytes(rq));
return ide_stopped; return ide_stopped;
} }
......
...@@ -261,7 +261,7 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive, ...@@ -261,7 +261,7 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
if (blk_special_request(rq)) { if (blk_special_request(rq)) {
rq->errors = 0; rq->errors = 0;
ide_complete_rq(drive, 0); ide_complete_rq(drive, 0, blk_rq_bytes(rq));
return ide_stopped; return ide_stopped;
} else } else
goto out_end; goto out_end;
......
...@@ -141,13 +141,13 @@ void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err) ...@@ -141,13 +141,13 @@ void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err)
kfree(cmd); kfree(cmd);
} }
int ide_complete_rq(ide_drive_t *drive, int error) int ide_complete_rq(ide_drive_t *drive, int error, unsigned int nr_bytes)
{ {
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
struct request *rq = hwif->rq; struct request *rq = hwif->rq;
int rc; int rc;
rc = blk_end_request(rq, error, blk_rq_bytes(rq)); rc = blk_end_request(rq, error, nr_bytes);
if (rc == 0) if (rc == 0)
hwif->rq = NULL; hwif->rq = NULL;
...@@ -164,7 +164,7 @@ void ide_kill_rq(ide_drive_t *drive, struct request *rq) ...@@ -164,7 +164,7 @@ void ide_kill_rq(ide_drive_t *drive, struct request *rq)
if ((media == ide_floppy || media == ide_tape) && drv_req) { if ((media == ide_floppy || media == ide_tape) && drv_req) {
rq->errors = 0; rq->errors = 0;
ide_complete_rq(drive, 0); ide_complete_rq(drive, 0, blk_rq_bytes(rq));
} else { } else {
if (media == ide_tape) if (media == ide_tape)
rq->errors = IDE_DRV_ERROR_GENERAL; rq->errors = IDE_DRV_ERROR_GENERAL;
...@@ -312,7 +312,7 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive, ...@@ -312,7 +312,7 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive,
printk("%s: DRIVE_CMD (null)\n", drive->name); printk("%s: DRIVE_CMD (null)\n", drive->name);
#endif #endif
rq->errors = 0; rq->errors = 0;
ide_complete_rq(drive, 0); ide_complete_rq(drive, 0, blk_rq_bytes(rq));
return ide_stopped; return ide_stopped;
} }
......
...@@ -778,7 +778,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive, ...@@ -778,7 +778,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
"Two DSC requests were queued\n"); "Two DSC requests were queued\n");
drive->failed_pc = NULL; drive->failed_pc = NULL;
rq->errors = 0; rq->errors = 0;
ide_complete_rq(drive, 0); ide_complete_rq(drive, 0, blk_rq_bytes(rq));
return ide_stopped; return ide_stopped;
} }
......
...@@ -294,7 +294,7 @@ void ide_finish_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat) ...@@ -294,7 +294,7 @@ void ide_finish_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat)
ide_complete_cmd(drive, cmd, stat, err); ide_complete_cmd(drive, cmd, stat, err);
rq->errors = err; rq->errors = err;
ide_complete_rq(drive, err ? -EIO : 0); ide_complete_rq(drive, err ? -EIO : 0, blk_rq_bytes(rq));
} }
/* /*
......
...@@ -1166,7 +1166,7 @@ extern int ide_devset_execute(ide_drive_t *drive, ...@@ -1166,7 +1166,7 @@ extern int ide_devset_execute(ide_drive_t *drive,
const struct ide_devset *setting, int arg); const struct ide_devset *setting, int arg);
void ide_complete_cmd(ide_drive_t *, struct ide_cmd *, u8, u8); void ide_complete_cmd(ide_drive_t *, struct ide_cmd *, u8, u8);
int ide_complete_rq(ide_drive_t *, int); int ide_complete_rq(ide_drive_t *, int, unsigned int);
void ide_tf_dump(const char *, struct ide_taskfile *); void ide_tf_dump(const char *, struct ide_taskfile *);
......
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