lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ide: remove BUG() from ide_complete_rq()

Browse Source 
It is no longer needed so remove it, also while at it dequeue the request
only on blk_end_request() success and make ide_complete_rq() return an error
value.

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

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

@@ -141,15 +141,17 @@ void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err)
kfree(cmd); kfree(cmd);
} }
void ide_complete_rq(ide_drive_t *drive, int error) int ide_complete_rq(ide_drive_t *drive, int error)
{ {
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
struct request *rq = hwif->rq; struct request *rq = hwif->rq;
int rc;
hwif->rq = NULL; rc = blk_end_request(rq, error, blk_rq_bytes(rq));
if (rc == 0)
hwif->rq = NULL;
if (unlikely(blk_end_request(rq, error, blk_rq_bytes(rq)))) return rc;
BUG();
} }
EXPORT_SYMBOL(ide_complete_rq); EXPORT_SYMBOL(ide_complete_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); 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);
void ide_complete_rq(ide_drive_t *, int); int ide_complete_rq(ide_drive_t *, int);
void ide_tf_dump(const char *, struct ide_taskfile *); void ide_tf_dump(const char *, struct ide_taskfile *);