V4L/DVB (8108): Fix open/close race in saa7134

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

diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
index 1b4ccf25b4d22ac109edd6e73ac06ed580141726..2b7a1187cb29a804988d686be4c8a8d088d6356f 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.
@@ -54,6 +55,8 @@ struct cfq_io_context {
 
        void (*dtor)(struct io_context *); /* destructor */
        void (*exit)(struct io_context *); /* called on task exit */
+
+       struct rcu_head rcu_head;
 };
 
 /*
@@ -88,8 +91,10 @@ 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_inc_not_zero(&ioc->refcount)) {
+               atomic_inc(&ioc->nr_tasks);
                return ioc;
+       }
 
        return NULL;
 }