Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/scsi/fcoe/fcoe.c
	net/core/drop_monitor.c
	net/core/net-traces.c

1 files changed, 3 insertions, 3 deletions

diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
index 08b987bccf89..dd05434fa45f 100644
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
@@ -64,7 +64,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 */
@@ -91,8 +91,8 @@ 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)) {
-                atomic_inc(&ioc->nr_tasks);
+        if (ioc && atomic_long_inc_not_zero(&ioc->refcount)) {
+                atomic_long_inc(&ioc->refcount);
                 return ioc;
         }