summaryrefslogtreecommitdiff
path: root/source3/modules
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-06-04 11:30:46 -0700
committerJeremy Allison <jra@samba.org>2010-06-04 11:30:46 -0700
commite0acee4919d1f416c98faa1a0ebc779f3716ab70 (patch)
tree261b500343f5eeed7ebe51b9d1f749941780f074 /source3/modules
parent15f64af8e3d5aa889a9c9fb852a3357237ba9972 (diff)
downloadsamba-e0acee4919d1f416c98faa1a0ebc779f3716ab70.tar.gz
samba-e0acee4919d1f416c98faa1a0ebc779f3716ab70.tar.bz2
samba-e0acee4919d1f416c98faa1a0ebc779f3716ab70.zip
Change smbd_aio_complete_mid() -> smbd_aio_complete_aio_ex(). Simplifies
the code and eliminates find_aio_ex(). Jeremy.
Diffstat (limited to 'source3/modules')
-rw-r--r--source3/modules/vfs_aio_fork.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index 8fd89362bc..38a1c21e29 100644
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -382,8 +382,8 @@ static void handle_aio_completion(struct event_context *event_ctx,
struct fd_event *event, uint16 flags,
void *p)
{
+ struct aio_extra *aio_ex = NULL;
struct aio_child *child = (struct aio_child *)p;
- uint64_t mid;
DEBUG(10, ("handle_aio_completion called with flags=%d\n", flags));
@@ -411,12 +411,7 @@ static void handle_aio_completion(struct event_context *event_ctx,
child->retval.size);
}
- /* FIXME - this won't work for SMB2. */
- mid = (uint64_t)child->aiocb->aio_sigevent.sigev_value.sival_int;
-
- DEBUG(10, ("mid %d finished\n", (int)mid));
-
- smbd_aio_complete_mid(mid);
+ smbd_aio_complete_aio_ex(aio_ex);
}
static int aio_child_destructor(struct aio_child *child)