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()
This commit is contained in:
commit
6af74b03e0
|
@ -38,7 +38,7 @@ config BLK_DEV_IO_TRACE
|
||||||
on a block device queue. For more information (and the user space
|
on a block device queue. For more information (and the user space
|
||||||
support tools needed), fetch the blktrace app from:
|
support tools needed), fetch the blktrace app from:
|
||||||
|
|
||||||
git://brick.kernel.dk/data/git/blktrace.git
|
git://git.kernel.dk/blktrace.git
|
||||||
|
|
||||||
config LSF
|
config LSF
|
||||||
bool "Support for Large Single Files"
|
bool "Support for Large Single Files"
|
||||||
|
|
|
@ -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
|
* if ref count is zero, don't allow sharing (ioc is going away, it's
|
||||||
* a race).
|
* 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 ioc;
|
||||||
|
}
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue