[PATCH] Remove ->rq_status from struct request

After Christophs SCSI change, the only usage left is RQ_ACTIVE
and RQ_INACTIVE. The block layer sets RQ_INACTIVE right before freeing
the request, so any check for RQ_INACTIVE in a driver is a bug and
indicates use-after-free.

So kill/clean the remaining users, straight forward.

Signed-off-by: Jens Axboe <axboe@suse.de>

3 files changed, 3 insertions, 5 deletions

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 0edc32204915..8ccee9c769f8 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -1281,8 +1281,7 @@ static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, struct request
         idefloppy_pc_t *pc;
         unsigned long block = (unsigned long)block_s;
 
-        debug_log(KERN_INFO "rq_status: %d, dev: %s, flags: %lx, errors: %d\n",
-                        rq->rq_status,
+        debug_log(KERN_INFO "dev: %s, flags: %lx, errors: %d\n",
                         rq->rq_disk ? rq->rq_disk->disk_name : "?",
                         rq->flags, rq->errors);
         debug_log(KERN_INFO "sector: %ld, nr_sectors: %ld, "
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index a3ffb04436bd..38479a29d3e1 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -1710,7 +1710,6 @@ int ide_do_drive_cmd (ide_drive_t *drive, struct request *rq, ide_action_t actio
         int must_wait = (action == ide_wait || action == ide_head_wait);
 
         rq->errors = 0;
-        rq->rq_status = RQ_ACTIVE;
 
         /*
          * we need to hold an extra reference to request for safe inspection
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 66f9678d2f10..2ebc3760f261 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -2423,8 +2423,8 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
 #if IDETAPE_DEBUG_LOG
 #if 0
         if (tape->debug_level >= 5)
-                printk(KERN_INFO "ide-tape: rq_status: %d, "
-                        "dev: %s, cmd: %ld, errors: %d\n", rq->rq_status,
+                printk(KERN_INFO "ide-tape:  %d, "
+                        "dev: %s, cmd: %ld, errors: %d\n",
                          rq->rq_disk->disk_name, rq->cmd[0], rq->errors);
 #endif
         if (tape->debug_level >= 2)