diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
commit | da206c9e68cb93fcab43592d46276c02889c1250 (patch) | |
tree | 21264cc26fa0322d668b398808f10bd93558d25f /fs/aio.c | |
parent | 916d15445f4ad2a9018e5451760734f36083be77 (diff) | |
parent | 2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
typo fixes
Clean up 'inline is not at beginning' warnings for usb storage
Storage class should be first
i386: Trivial typo fixes
ixj: make ixj_set_tone_off() static
spelling fixes
fix paniced->panicked typos
Spelling fixes for Documentation/atomic_ops.txt
move acknowledgment for Mark Adler to CREDITS
remove the bouncing email address of David Campbell
Diffstat (limited to 'fs/aio.c')
-rw-r--r-- | fs/aio.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -641,7 +641,7 @@ static inline int __queue_kicked_iocb(struct kiocb *iocb) | |||
641 | * invoked both for initial i/o submission and | 641 | * invoked both for initial i/o submission and |
642 | * subsequent retries via the aio_kick_handler. | 642 | * subsequent retries via the aio_kick_handler. |
643 | * Expects to be invoked with iocb->ki_ctx->lock | 643 | * Expects to be invoked with iocb->ki_ctx->lock |
644 | * already held. The lock is released and reaquired | 644 | * already held. The lock is released and reacquired |
645 | * as needed during processing. | 645 | * as needed during processing. |
646 | * | 646 | * |
647 | * Calls the iocb retry method (already setup for the | 647 | * Calls the iocb retry method (already setup for the |