linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / blkdev.h

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 59e1259..860e7a4 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -17,14 +17,11 @@
 
 #include <asm/scatterlist.h>
 
-struct scsi_ioctl_command;
-
 struct request_queue;
 typedef struct request_queue request_queue_t;
 struct elevator_queue;
 typedef struct elevator_queue elevator_t;
 struct request_pm_state;
-struct blk_trace;
 
 #define BLKDEV_MIN_RQ  4
 #define BLKDEV_MAX_RQ  128     /* Default maximum */
@@ -57,29 +54,23 @@ struct as_io_context {
 
 struct cfq_queue;
 struct cfq_io_context {
-       struct rb_node rb_node;
+       /*
+        * circular list of cfq_io_contexts belonging to a process io context
+        */
+       struct list_head list;
+       struct cfq_queue *cfqq;
        void *key;
 
-       struct cfq_queue *cfqq[2];
-
        struct io_context *ioc;
 
        unsigned long last_end_request;
-       sector_t last_request_pos;
-       unsigned long last_queue;
-
+       unsigned long last_queue;
        unsigned long ttime_total;
        unsigned long ttime_samples;
        unsigned long ttime_mean;
 
-       unsigned int seek_samples;
-       u64 seek_total;
-       sector_t seek_mean;
-
-       struct list_head queue_list;
-
-       void (*dtor)(struct io_context *); /* destructor */
-       void (*exit)(struct io_context *); /* called on task exit */
+       void (*dtor)(struct cfq_io_context *);
+       void (*exit)(struct cfq_io_context *);
 };
 
 /*
@@ -100,7 +91,7 @@ struct io_context {
        int nr_batch_requests;     /* Number of requests left in the batch */
 
        struct as_io_context *aic;
-       struct rb_root cic_root;
+       struct cfq_io_context *cic;
 };
 
 void put_io_context(struct io_context *ioc);
@@ -413,6 +404,8 @@ struct request_queue
 
        struct blk_queue_tag    *queue_tags;
 
+       atomic_t                refcnt;
+
        unsigned int            nr_sorted;
        unsigned int            in_flight;
 
@@ -423,8 +416,6 @@ struct request_queue
        unsigned int            sg_reserved_size;
        int                     node;
 
-       struct blk_trace        *blk_trace;
-
        /*
         * reserved for flush operations
         */
@@ -433,8 +424,6 @@ struct request_queue
        struct request          pre_flush_rq, bar_rq, post_flush_rq;
        struct request          *orig_bar_rq;
        unsigned int            bi_size;
-
-       struct mutex            sysfs_lock;
 };
 
 #define RQ_INACTIVE            (-1)
@@ -613,8 +602,6 @@ extern void blk_plug_device(request_queue_t *);
 extern int blk_remove_plug(request_queue_t *);
 extern void blk_recount_segments(request_queue_t *, struct bio *);
 extern int scsi_cmd_ioctl(struct file *, struct gendisk *, unsigned int, void __user *);
-extern int sg_scsi_ioctl(struct file *, struct request_queue *,
-               struct gendisk *, struct scsi_ioctl_command __user *);
 extern void blk_start_queue(request_queue_t *q);
 extern void blk_stop_queue(request_queue_t *q);
 extern void blk_sync_queue(struct request_queue *q);
@@ -738,7 +725,7 @@ extern long nr_blockdev_pages(void);
 int blk_get_queue(request_queue_t *);
 request_queue_t *blk_alloc_queue(gfp_t);
 request_queue_t *blk_alloc_queue_node(gfp_t, int);
-extern void blk_put_queue(request_queue_t *);
+#define blk_put_queue(q) blk_cleanup_queue((q))
 
 /*
  * tag stuff