Commit 6af74b03 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 1076bb40 75ce6fac

block/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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"

include/linux/iocontext.h

+3 −1
Original line number Diff line number Diff line
@@ -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;

}