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

block: fix some more cmd_type cleanup fallout

Browse Source 
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
This commit is contained in:
Christoph Hellwig 2010-06-19 17:26:47 +02:00 committed by Jens Axboe
parent 15fa6e8165
commit 4c4762d10f
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/block/ub.c
View File

@ -648,7 +648,7 @@ static int ub_request_fn_1(struct ub_lun *lun, struct request *rq)
return 0; return 0;
} }
if (lun->changed && rq->cmd_type != REQ_TYPE_BLOCK_PC) if (lun->changed && rq->cmd_type != REQ_TYPE_BLOCK_PC) {
blk_start_request(rq); blk_start_request(rq);
ub_end_rq(rq, SAM_STAT_CHECK_CONDITION); ub_end_rq(rq, SAM_STAT_CHECK_CONDITION);
return 0; return 0;

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

@ -307,7 +307,7 @@ EXPORT_SYMBOL_GPL(ide_cd_expiry);
int ide_cd_get_xferlen(struct request *rq) int ide_cd_get_xferlen(struct request *rq)
{ {
switch (rq->cmd_type) switch (rq->cmd_type) {
case REQ_TYPE_FS: case REQ_TYPE_FS:
return 32768; return 32768;
case REQ_TYPE_SENSE: case REQ_TYPE_SENSE:
@ -477,12 +477,12 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
if (uptodate == 0) if (uptodate == 0)
drive->failed_pc = NULL; drive->failed_pc = NULL;
if (rq->cmd_type == REQ_TYPE_SPECIAL) if (rq->cmd_type == REQ_TYPE_SPECIAL) {
rq->errors = 0; rq->errors = 0;
error = 0; error = 0;
} else { } else {
if (req->cmd_type != REQ_TYPE_FS && uptodate <= 0) { if (rq->cmd_type != REQ_TYPE_FS && uptodate <= 0) {
if (rq->errors == 0) if (rq->errors == 0)
rq->errors = -EIO; rq->errors = -EIO;
} }

4
drivers/ide/ide-cd.c
View File

@ -318,7 +318,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)
cdrom_saw_media_change(drive); cdrom_saw_media_change(drive);
if (rq->cmd_type == REQ_TYPE_FS && if (rq->cmd_type == REQ_TYPE_FS &&
!(rq->cmd_flags & REQ_QUIET)) { !(rq->cmd_flags & REQ_QUIET))
printk(KERN_ERR PFX "%s: tray open\n", printk(KERN_ERR PFX "%s: tray open\n",
drive->name); drive->name);
} }
@ -375,7 +375,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)
do_end_request = 1; do_end_request = 1;
break; break;
default: default:
if (req->cmd_type != REQ_TYPE_FS) if (rq->cmd_type != REQ_TYPE_FS)
break; break;
if (err & ~ATA_ABORTED) { if (err & ~ATA_ABORTED) {
/* go to the default handler for other errors */ /* go to the default handler for other errors */

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

@ -353,7 +353,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
pm->pm_step == IDE_PM_COMPLETED) pm->pm_step == IDE_PM_COMPLETED)
ide_complete_pm_rq(drive, rq); ide_complete_pm_rq(drive, rq);
return startstop; return startstop;
} else if (!rq->rq_disk && rq->cmd_type == REQ_TYPE_SPECIAL) { } else if (!rq->rq_disk && rq->cmd_type == REQ_TYPE_SPECIAL)
/* /*
* TODO: Once all ULDs have been modified to * TODO: Once all ULDs have been modified to
* check for specific op codes rather than * check for specific op codes rather than