[SCM] Samba Shared Repository - branch v3-6-test updated
Volker Lendecke
vlendec at samba.org
Mon Feb 28 07:27:14 MST 2011
The branch, v3-6-test has been updated
via 903deb0 s3: Survive an idle child that was killed
from 1018345 s3: smbcontrol to notify smbd about idmap changes
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 903deb0b22426068b9e145b024ddb635665d1fc1
Author: Christian Ambach <christian.ambach at de.ibm.com>
Date: Wed Feb 23 11:10:15 2011 +0100
s3: Survive an idle child that was killed
Autobuild-User: Volker Lendecke <vlendec at samba.org>
Autobuild-Date: Mon Feb 28 14:53:20 CET 2011 on sn-devel-104
(cherry picked from commit 3854413c246a3a69d100af6e827ce8f217bf408e)
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_aio_fork.c | 6 ++++++
1 files changed, 6 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 0cea931..4ddc71e 100644
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -407,6 +407,12 @@ static void handle_aio_completion(struct event_context *event_ctx,
child->retval.ret_errno = EIO;
}
+ if (child->aiocb == NULL) {
+ DEBUG(1, ("Inactive child died\n"));
+ TALLOC_FREE(child);
+ return;
+ }
+
if (child->cancelled) {
child->aiocb = NULL;
child->cancelled = false;
--
Samba Shared Repository
More information about the samba-cvs
mailing list