[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, 4 insertions, 5 deletions

diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 500d2ebb41e4..38578b9dbfd1 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -719,7 +719,6 @@ static int pd_special_command(struct pd_unit *disk,
 
         memset(&rq, 0, sizeof(rq));
         rq.errors = 0;
-        rq.rq_status = RQ_ACTIVE;
         rq.rq_disk = disk->gd;
         rq.ref_count = 1;
         rq.end_io_data = &wait;
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index cc42e762396f..f2305ee792a1 100644
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -319,8 +319,8 @@ static void start_request(struct floppy_state *fs)
                 printk("do_fd_req: dev=%s cmd=%d sec=%ld nr_sec=%ld buf=%p\n",
                        req->rq_disk->disk_name, req->cmd,
                        (long)req->sector, req->nr_sectors, req->buffer);
-                printk("           rq_status=%d errors=%d current_nr_sectors=%ld\n",
-                       req->rq_status, req->errors, req->current_nr_sectors);
+                printk("           errors=%d current_nr_sectors=%ld\n",
+                       req->errors, req->current_nr_sectors);
 #endif
 
                 if (req->sector < 0 || req->sector >= fs->total_secs) {
diff --git a/drivers/block/swim_iop.c b/drivers/block/swim_iop.c
index 89e3c2f8b776..dfda796eba56 100644
--- a/drivers/block/swim_iop.c
+++ b/drivers/block/swim_iop.c
@@ -529,8 +529,8 @@ static void start_request(struct floppy_state *fs)
                 printk("do_fd_req: dev=%s cmd=%d sec=%ld nr_sec=%ld buf=%p\n",
                        CURRENT->rq_disk->disk_name, CURRENT->cmd,
                        CURRENT->sector, CURRENT->nr_sectors, CURRENT->buffer);
-                printk("           rq_status=%d errors=%d current_nr_sectors=%ld\n",
-                       CURRENT->rq_status, CURRENT->errors, CURRENT->current_nr_sectors);
+                printk("           errors=%d current_nr_sectors=%ld\n",
+                      CURRENT->errors, CURRENT->current_nr_sectors);
 #endif
 
                 if (CURRENT->sector < 0 || CURRENT->sector >= fs->total_secs) {