summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-31 19:10:26 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-31 19:10:26 (GMT)
commita5bc92cdf2ab27a15732976004b3755c40740f57 (patch)
treeab7ee562f31ed9fddac78c1e17a2ba9eee6cb028 /include
parent6eb80e00bff341dd09a7ec8b9dba6da8410448bf (diff)
parentcbb4f2646d77b536ed2b1500ef6641083228ed8f (diff)
downloadlinux-a5bc92cdf2ab27a15732976004b3755c40740f57.tar.xz
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: io context: fix ref counting block: make the end_io functions be non-GPL exports block: fix improper kobject release in blk_integrity_unregister block: always assign default lock to queues mg_disk: Add missing ready status check on mg_write() mg_disk: fix issue with data integrity on error in mg_write() mg_disk: fix reading invalid status when use polling driver mg_disk: remove prohibited sleep operation
Diffstat (limited to 'include')
-rw-r--r--include/linux/iocontext.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
index dd05434..4da4a75 100644
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
@@ -92,7 +92,7 @@ static inline struct io_context *ioc_task_link(struct io_context *ioc)
* a race).
*/
if (ioc && atomic_long_inc_not_zero(&ioc->refcount)) {
- atomic_long_inc(&ioc->refcount);
+ atomic_inc(&ioc->nr_tasks);
return ioc;
}