ax25: netrom: rose: Fix timer oopses

[safe/jmp/linux-2.6] / include / linux / iocontext.h

diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
index cd44d45..a632359 100644 (file)
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
@@ -1,6 +1,9 @@
 #ifndef IOCONTEXT_H
 #define IOCONTEXT_H
 
+#include <linux/radix-tree.h>
+#include <linux/rcupdate.h>
+
 /*
  * This is the per-process anticipatory I/O scheduler state.
  */
@@ -29,28 +32,26 @@ struct as_io_context {
 
 struct cfq_queue;
 struct cfq_io_context {
-       struct rb_node rb_node;
        void *key;
+       unsigned long dead_key;
 
        struct cfq_queue *cfqq[2];
 
        struct io_context *ioc;
 
        unsigned long last_end_request;
-       sector_t last_request_pos;
 
        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;
+       struct hlist_node cic_list;
 
        void (*dtor)(struct io_context *); /* destructor */
        void (*exit)(struct io_context *); /* called on task exit */
+
+       struct rcu_head rcu_head;
 };
 
 /*
@@ -58,7 +59,7 @@ struct cfq_io_context {
  * and kmalloc'ed. These could be shared between processes.
  */
 struct io_context {
-       atomic_t refcount;
+       atomic_long_t refcount;
        atomic_t nr_tasks;
 
        /* all the fields below are protected by this lock */
@@ -67,6 +68,10 @@ struct io_context {
        unsigned short ioprio;
        unsigned short ioprio_changed;
 
+#ifdef CONFIG_BLK_CGROUP
+       unsigned short cgroup_changed;
+#endif
+
        /*
         * For request batching
         */
@@ -74,7 +79,8 @@ 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 radix_tree_root radix_root;
+       struct hlist_head cic_list;
        void *ioc_data;
 };
 
@@ -84,10 +90,31 @@ static inline struct io_context *ioc_task_link(struct io_context *ioc)
         * if ref count is zero, don't allow sharing (ioc is going away, it's
         * a race).
         */
-       if (ioc && atomic_inc_not_zero(&ioc->refcount))
+       if (ioc && atomic_long_inc_not_zero(&ioc->refcount)) {
+               atomic_inc(&ioc->nr_tasks);
                return ioc;
+       }
 
        return NULL;
 }
 
+struct task_struct;
+#ifdef CONFIG_BLOCK
+int put_io_context(struct io_context *ioc);
+void exit_io_context(struct task_struct *task);
+struct io_context *get_io_context(gfp_t gfp_flags, int node);
+struct io_context *alloc_io_context(gfp_t gfp_flags, int node);
+void copy_io_context(struct io_context **pdst, struct io_context **psrc);
+#else
+static inline void exit_io_context(struct task_struct *task)
+{
+}
+
+struct io_context;
+static inline int put_io_context(struct io_context *ioc)
+{
+       return 1;
+}
+#endif
+
 #endif