Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[linux-2.6-omap-h63xx.git] / include / linux / iocontext.h

diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
index 593b222d9dcc25334be5ca6d05dc0a5ab413f5f5..cac4b364cd40a18c83daa5ee47c1758e68b7e9ad 100644 (file)
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
@@ -2,6 +2,7 @@
 #define IOCONTEXT_H
 
 #include <linux/radix-tree.h>
+#include <linux/rcupdate.h>
 
 /*
  * This is the per-process anticipatory I/O scheduler state.
@@ -50,9 +51,12 @@ struct cfq_io_context {
        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;
 };
 
 /*
@@ -77,6 +81,7 @@ struct io_context {
 
        struct as_io_context *aic;
        struct radix_tree_root radix_root;
+       struct hlist_head cic_list;
        void *ioc_data;
 };