diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-20 11:01:10 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-20 11:01:10 -0600 |
| commit | 8b17ed4caa7e015324a4ecbe3c863e32458d840a (patch) | |
| tree | e323612dffd78dd4cb75f58f731d208c0bf9ffce /include | |
| parent | b54c2873e731dd6fc81a4591cab909633b5a9eab (diff) | |
| parent | cf139388ad5b39228793f34eea99e0ea9a2924aa (diff) | |
Merge remote-tracking branch 'stefanha/block' into staging
# By Kevin Wolf (4) and others
# Via Stefan Hajnoczi
* stefanha/block:
dataplane: support viostor virtio-pci status bit setting
dataplane: avoid reentrancy during virtio_blk_data_plane_stop()
win32-aio: use iov utility functions instead of open-coding them
win32-aio: Fix memory leak
win32-aio: Fix vectored reads
aio: Fix return value of aio_poll()
ide: Remove wrong assertion
block: fix null-pointer bug on error case in block commit
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/aio.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/block/aio.h b/include/block/aio.h index 0933f05878..8eda924599 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -173,16 +173,14 @@ bool aio_pending(AioContext *ctx); * aio as a result of executing I/O completion or bh callbacks. * * If there is no pending AIO operation or completion (bottom half), - * return false. If there are pending bottom halves, return true. + * return false. If there are pending AIO operations of bottom halves, + * return true. * * If there are no pending bottom halves, but there are pending AIO * operations, it may not be possible to make any progress without * blocking. If @blocking is true, this function will wait until one * or more AIO events have completed, to ensure something has moved * before returning. - * - * If @blocking is false, this function will also return false if the - * function cannot make any progress without blocking. */ bool aio_poll(AioContext *ctx, bool blocking); |