summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-16 07:45:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-16 07:45:45 -0700
commit6af74b03e00fc78806f75f6701b24b582bbb5c96 (patch)
treef2370760e5096b75c07baa98084576c6fb906191
parent1076bb40585dc3a4ae6143ecc5a1654495b84c42 (diff)
parent75ce6faccdbbea4465876a759917d4994660c025 (diff)
downloadlinux-6af74b03e00fc78806f75f6701b24b582bbb5c96.tar.gz
linux-6af74b03e00fc78806f75f6701b24b582bbb5c96.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: block: update git url for blktrace io context: increment task attachment count in ioc_task_link()
-rw-r--r--block/Kconfig2
-rw-r--r--include/linux/iocontext.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/block/Kconfig b/block/Kconfig
index 9bda7bc..7db9a41 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -38,7 +38,7 @@ config BLK_DEV_IO_TRACE
on a block device queue. For more information (and the user space
support tools needed), fetch the blktrace app from:
- git://brick.kernel.dk/data/git/blktrace.git
+ git://git.kernel.dk/blktrace.git
config LSF
bool "Support for Large Single Files"
diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
index cac4b36..2b7a118 100644
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
@@ -91,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;
}