tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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()

Linus Torvalds 6af74b03 1076bb40

+4 -2
+1 -1
block/Kconfig
··· 38 38 on a block device queue. For more information (and the user space 39 39 support tools needed), fetch the blktrace app from: 40 40 41 - git://brick.kernel.dk/data/git/blktrace.git 41 + git://git.kernel.dk/blktrace.git 42 42 43 43 config LSF 44 44 bool "Support for Large Single Files"
+3 -1
include/linux/iocontext.h
··· 91 91 * if ref count is zero, don't allow sharing (ioc is going away, it's 92 92 * a race). 93 93 */ 94 - if (ioc && atomic_inc_not_zero(&ioc->refcount)) 94 + if (ioc && atomic_inc_not_zero(&ioc->refcount)) { 95 + atomic_inc(&ioc->nr_tasks); 95 96 return ioc; 97 + } 96 98 97 99 return NULL; 98 100 }