diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-15 02:43:27 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-15 02:43:27 +0200 |
commit | a311c480384c5aa9aaae195b89c3ec89c3b66379 (patch) | |
tree | 9e3f141bb7649278e0fe30e68d965f2243c32bb9 /fs/proc/softirqs.c | |
parent | fix __swap_writepage() compile failure on old gcc versions (diff) | |
parent | aio: cleanup: flatten kill_ioctx() (diff) | |
download | linux-a311c480384c5aa9aaae195b89c3ec89c3b66379.tar.xz linux-a311c480384c5aa9aaae195b89c3ec89c3b66379.zip |
Merge git://git.kvack.org/~bcrl/aio-next
Pull aio fix and cleanups from Ben LaHaise:
"This consists of a couple of code cleanups plus a minor bug fix"
* git://git.kvack.org/~bcrl/aio-next:
aio: cleanup: flatten kill_ioctx()
aio: report error from io_destroy() when threads race in io_destroy()
fs/aio.c: Remove ctx parameter in kiocb_cancel
Diffstat (limited to 'fs/proc/softirqs.c')
0 files changed, 0 insertions, 0 deletions