block: fix some more cmd_type cleanup fallout

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 034b34440ffa33e07f7d62ff495c47f46c3694f0..aaf27fb4efd6e783b7ab1bdab470f931403706c2 100644 (file)
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -648,7 +648,7 @@ static int ub_request_fn_1(struct ub_lun *lun, struct request *rq)
                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);
                ub_end_rq(rq, SAM_STAT_CHECK_CONDITION);
                return 0;

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 3117a894d20e04fa97db7faf5932e1c28e962562..e88a2cf177110f37fdd6bfc6d1801184ec2b94f4 100644 (file)
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -307,7 +307,7 @@ EXPORT_SYMBOL_GPL(ide_cd_expiry);
 
 int ide_cd_get_xferlen(struct request *rq)
 {
-       switch (rq->cmd_type)
+       switch (rq->cmd_type) {
        case REQ_TYPE_FS:
                return 32768;
        case REQ_TYPE_SENSE:
@@ -477,12 +477,12 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
                if (uptodate == 0)
                        drive->failed_pc = NULL;
 
-               if (rq->cmd_type == REQ_TYPE_SPECIAL)
+               if (rq->cmd_type == REQ_TYPE_SPECIAL) {
                        rq->errors = 0;
                        error = 0;
                } else {
 
-                       if (req->cmd_type != REQ_TYPE_FS && uptodate <= 0) {
+                       if (rq->cmd_type != REQ_TYPE_FS && uptodate <= 0) {
                                if (rq->errors == 0)
                                        rq->errors = -EIO;
                        }

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 26a3688de467fbdb66ba1135216d8ac44dc6e284..ef7e3a9bee5182790978870141c69023b6c2e205 100644 (file)
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -318,7 +318,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)
                        cdrom_saw_media_change(drive);
 
                        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",
                                        drive->name);
                }
@@ -375,7 +375,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)
                do_end_request = 1;
                break;
        default:
-               if (req->cmd_type != REQ_TYPE_FS)
+               if (rq->cmd_type != REQ_TYPE_FS)
                        break;
                if (err & ~ATA_ABORTED) {
                        /* go to the default handler for other errors */

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 9304a7e54d9e9fedddbdd60e735f646dbf151d78..a381be814070f247737957ced84c22c4a9a315aa 100644 (file)
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -353,7 +353,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
                            pm->pm_step == IDE_PM_COMPLETED)
                                ide_complete_pm_rq(drive, rq);
                        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
                         * check for specific op codes rather than