block: fix some more cmd_type cleanup fallout

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

4 files changed, 7 insertions, 7 deletions

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 034b34440ffa..aaf27fb4efd6 100644
--- 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 3117a894d20e..e88a2cf17711 100644
--- 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 26a3688de467..ef7e3a9bee51 100644
--- 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 9304a7e54d9e..a381be814070 100644
--- 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