[SCM] Samba Shared Repository - branch master updated
Volker Lendecke
vlendec at samba.org
Sat Feb 26 09:43:02 MST 2011
The branch, master has been updated
via 48200c2 s3: Improve a dbg msg in aio_fork
from b0aba17 nss_wrapper: Fix a segfault when libnss_winbind.so is not loadable
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 48200c27eaaa961dd17f27a973ab07ccb7afbd8f
Author: Volker Lendecke <vl at samba.org>
Date: Wed Feb 23 11:09:32 2011 +0100
s3: Improve a dbg msg in aio_fork
Autobuild-User: Volker Lendecke <vlendec at samba.org>
Autobuild-Date: Sat Feb 26 17:42:37 CET 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_aio_fork.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index 0d51513..0cea931 100644
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -389,6 +389,7 @@ static void handle_aio_completion(struct event_context *event_ctx,
{
struct aio_extra *aio_ex = NULL;
struct aio_child *child = (struct aio_child *)p;
+ NTSTATUS status;
DEBUG(10, ("handle_aio_completion called with flags=%d\n", flags));
@@ -396,10 +397,12 @@ static void handle_aio_completion(struct event_context *event_ctx,
return;
}
- if (!NT_STATUS_IS_OK(read_data(child->sockfd,
- (char *)&child->retval,
- sizeof(child->retval)))) {
- DEBUG(0, ("aio child %d died\n", (int)child->pid));
+ status = read_data(child->sockfd, (char *)&child->retval,
+ sizeof(child->retval));
+
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("aio child %d died: %s\n", (int)child->pid,
+ nt_errstr(status)));
child->retval.size = -1;
child->retval.ret_errno = EIO;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list