tree 0f1d4a41cf6d1e6be924d1441ce1352ae2028fa4
parent 88ec63d6f85ccf40988ddae8b430dcb07355b29b
parent 00fefb9cf2b5493a86912de55ba912bdfae4a207
author Linus Torvalds <torvalds@linux-foundation.org> 1408200987 -0600
committer Linus Torvalds <torvalds@linux-foundation.org> 1408200987 -0600

Merge git://git.kvack.org/~bcrl/aio-next

Pull aio updates from Ben LaHaise.

* git://git.kvack.org/~bcrl/aio-next:
  aio: use iovec array rather than the single one
  aio: fix some comments
  aio: use the macro rather than the inline magic number
  aio: remove the needless registration of ring file's private_data
  aio: remove no longer needed preempt_disable()
  aio: kill the misleading rcu read locks in ioctx_add_table() and kill_ioctx()
  aio: change exit_aio() to load mm->ioctx_table once and avoid rcu_read_lock()