leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2009-03-27 12:46:44 +01:00
parent a9587fd8c4
commit f974b196f5
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ide/ide-atapi.c
View File

@ -404,7 +404,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
if (blk_special_request(rq)) {
rq->errors = 0;
ide_complete_rq(drive, 0);
ide_complete_rq(drive, 0, blk_rq_bytes(rq));
} else {
if (blk_fs_request(rq) == 0 && uptodate <= 0) {
if (rq->errors == 0)

2
drivers/ide/ide-eh.c
View File

@ -134,7 +134,7 @@ ide_startstop_t ide_error(ide_drive_t *drive, const char *msg, u8 stat)
return ide_stopped;
}
rq->errors = err;
ide_complete_rq(drive, err ? -EIO : 0);
ide_complete_rq(drive, err ? -EIO : 0, blk_rq_bytes(rq));
return ide_stopped;
}

2
drivers/ide/ide-floppy.c
View File

@ -261,7 +261,7 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
if (blk_special_request(rq)) {
rq->errors = 0;
ide_complete_rq(drive, 0);
ide_complete_rq(drive, 0, blk_rq_bytes(rq));
return ide_stopped;
} else
goto out_end;

8
drivers/ide/ide-io.c
View File

@ -141,13 +141,13 @@ void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err)
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;
struct request *rq = hwif->rq;
int rc;
rc = blk_end_request(rq, error, blk_rq_bytes(rq));
rc = blk_end_request(rq, error, nr_bytes);
if (rc == 0)
hwif->rq = NULL;
@ -164,7 +164,7 @@ void ide_kill_rq(ide_drive_t *drive, struct request *rq)
if ((media == ide_floppy || media == ide_tape) && drv_req) {
rq->errors = 0;
ide_complete_rq(drive, 0);
ide_complete_rq(drive, 0, blk_rq_bytes(rq));
} else {
if (media == ide_tape)
rq->errors = IDE_DRV_ERROR_GENERAL;
@ -312,7 +312,7 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive,
printk("%s: DRIVE_CMD (null)\n", drive->name);
#endif
rq->errors = 0;
ide_complete_rq(drive, 0);
ide_complete_rq(drive, 0, blk_rq_bytes(rq));
return ide_stopped;
}

2
drivers/ide/ide-tape.c
View File

@ -778,7 +778,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
"Two DSC requests were queued\n");
drive->failed_pc = NULL;
rq->errors = 0;
ide_complete_rq(drive, 0);
ide_complete_rq(drive, 0, blk_rq_bytes(rq));
return ide_stopped;
}

2
drivers/ide/ide-taskfile.c
View File

@ -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);
rq->errors = err;
ide_complete_rq(drive, err ? -EIO : 0);
ide_complete_rq(drive, err ? -EIO : 0, blk_rq_bytes(rq));
}
/*

2
include/linux/ide.h
View File

@ -1166,7 +1166,7 @@ extern int ide_devset_execute(ide_drive_t *drive,
const struct ide_devset *setting, int arg);
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 *);