diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-16 07:45:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-16 07:45:45 -0700 |
| commit | 6af74b03e00fc78806f75f6701b24b582bbb5c96 (patch) | |
| tree | f2370760e5096b75c07baa98084576c6fb906191 | |
| parent | 1076bb40585dc3a4ae6143ecc5a1654495b84c42 (diff) | |
| parent | 75ce6faccdbbea4465876a759917d4994660c025 (diff) | |
| download | linux-3.10-6af74b03e00fc78806f75f6701b24b582bbb5c96.tar.gz linux-3.10-6af74b03e00fc78806f75f6701b24b582bbb5c96.tar.bz2 linux-3.10-6af74b03e00fc78806f75f6701b24b582bbb5c96.zip | |
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/Kconfig | 2 | ||||
| -rw-r--r-- | include/linux/iocontext.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/block/Kconfig b/block/Kconfig index 9bda7bc8030..7db9a411649 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 cac4b364cd4..2b7a1187cb2 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; } |