12 files changed, 14 insertions, 26 deletions

diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 5fa4c8e258a4..fda4a3940698 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -981,8 +981,6 @@ static int prepare_request(struct request *req, struct io_thread_req *io_req)
         __u64 offset;
         int len;
 
-        if(req->rq_status == RQ_INACTIVE) return(1);
-
         /* This should be impossible now */
         if((rq_data_dir(req) == WRITE) && !dev->openflags.w){
                 printk("Write attempted on readonly ubd device %s\n",
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index f7462502bfdf..b94a396aa624 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -283,7 +283,6 @@ static inline void rq_init(request_queue_t *q, struct request *rq)
         INIT_LIST_HEAD(&rq->donelist);
 
         rq->errors = 0;
-        rq->rq_status = RQ_ACTIVE;
         rq->bio = rq->biotail = NULL;
         INIT_HLIST_NODE(&rq->hash);
         RB_CLEAR_NODE(&rq->rb_node);
@@ -2685,8 +2684,6 @@ void __blk_put_request(request_queue_t *q, struct request *req)
 
         elv_completed_request(q, req);
 
-        req->rq_status = RQ_INACTIVE;
-
         /*
          * Request may not have originated from ll_rw_blk. if not,
          * it didn't come out of our reserved rq pools
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) {
diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c
index 1a159e8843ca..22d17474755f 100644
--- a/drivers/fc4/fc.c
+++ b/drivers/fc4/fc.c
@@ -974,7 +974,6 @@ int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt)
          */
 
         fc->rst_pkt->device->host->eh_action = &sem;
-        fc->rst_pkt->request->rq_status = RQ_SCSI_BUSY;
 
         fc->rst_pkt->done = fcp_scsi_reset_done;
 
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)
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 65b19695ebe2..1427a41e8441 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -708,7 +708,7 @@ static ide_startstop_t idescsi_issue_pc (ide_drive_t *drive, idescsi_pc_t *pc)
 static ide_startstop_t idescsi_do_request (ide_drive_t *drive, struct request *rq, sector_t block)
 {
 #if IDESCSI_DEBUG_LOG
-        printk (KERN_INFO "rq_status: %d, dev: %s, cmd: %x, errors: %d\n",rq->rq_status, rq->rq_disk->disk_name,rq->cmd[0],rq->errors);
+        printk (KERN_INFO "dev: %s, cmd: %x, errors: %d\n", rq->rq_disk->disk_name,rq->cmd[0],rq->errors);
         printk (KERN_INFO "sector: %ld, nr_sectors: %ld, current_nr_sectors: %d\n",rq->sector,rq->nr_sectors,rq->current_nr_sectors);
 #endif /* IDESCSI_DEBUG_LOG */
 
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 7a054f9d1ee3..12f6639dda2d 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -1065,7 +1065,7 @@ int scsi_device_cancel(struct scsi_device *sdev, int recovery)
 
         spin_lock_irqsave(&sdev->list_lock, flags);
         list_for_each_entry(scmd, &sdev->cmd_list, list) {
-                if (scmd->request && scmd->request->rq_status != RQ_INACTIVE) {
+                if (scmd->request) {
                         /*
                          * If we are unable to remove the timer, it means
                          * that the command has already timed out or
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index d4c1dd046e27..8a3e309e0842 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -243,8 +243,6 @@ struct request {
 
         void *completion_data;
 
-        int rq_status;  /* should split this into a few status bits */
-        int errors;
         struct gendisk *rq_disk;
         unsigned long start_time;
 
@@ -262,14 +260,16 @@ struct request {
 
         unsigned short ioprio;
 
-        int tag;
-
-        int ref_count;
         request_queue_t *q;
 
         void *special;
         char *buffer;
 
+        int tag;
+        int errors;
+
+        int ref_count;
+
         /*
          * when request is used as a packet command carrier
          */
@@ -456,9 +456,6 @@ struct request_queue
         struct mutex            sysfs_lock;
 };
 
-#define RQ_INACTIVE             (-1)
-#define RQ_ACTIVE               1
-
 #define QUEUE_FLAG_CLUSTER      0       /* cluster several segments into 1 */
 #define QUEUE_FLAG_QUEUED       1       /* uses generic tag queueing */
 #define QUEUE_FLAG_STOPPED      2       /* queue is stopped */