[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  fb79a8d... Oops. Forgot to re-initialize the aio_ex pointer from sival_ptr.
      from  b12409a... wait_for_aio_completion() should return 0 on non-aio compiled case.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fb79a8d7f0f4b7686983d8c9025c1ebd0445e84f
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jun 4 13:49:38 2010 -0700

    Oops. Forgot to re-initialize the aio_ex pointer from sival_ptr.

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_aio_fork.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index 38a1c21..b026254 100644
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -411,6 +411,7 @@ static void handle_aio_completion(struct event_context *event_ctx,
 		       child->retval.size);
 	}
 
+	aio_ex = (struct aio_extra *)child->aiocb->aio_sigevent.sigev_value.sival_ptr;
 	smbd_aio_complete_aio_ex(aio_ex);
 }
 


-- 
Samba Shared Repository