From e0acee4919d1f416c98faa1a0ebc779f3716ab70 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 4 Jun 2010 11:30:46 -0700 Subject: Change smbd_aio_complete_mid() -> smbd_aio_complete_aio_ex(). Simplifies the code and eliminates find_aio_ex(). Jeremy. --- source3/modules/vfs_aio_fork.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'source3/modules/vfs_aio_fork.c') 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) -- cgit