[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-579-gda2c19c
Jeremy Allison
jra at samba.org
Tue Apr 1 00:02:06 GMT 2008
The branch, v3-2-test has been updated
via da2c19c481d0041872b4ce2f5105052077f3d3b8 (commit)
from 26a74d01bb2b53ffa5d296ff1c7d8b2b0d17831a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit da2c19c481d0041872b4ce2f5105052077f3d3b8
Author: Jeremy Allison <jra at samba.org>
Date: Mon Mar 31 17:01:27 2008 -0700
Ok, final move of this code :-). I think I've found the correct
place for it now where it will cause minimal disruption (only
call the extra message_dispatch just before reading the next
smb off the wire).
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/smbd/process.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/process.c b/source/smbd/process.c
index 9aa775d..8868431 100644
--- a/source/smbd/process.c
+++ b/source/smbd/process.c
@@ -873,15 +873,6 @@ static NTSTATUS receive_message_or_smb(TALLOC_CTX *mem_ctx, char **buffer,
return map_nt_error_from_unix(errno);
}
- /*
- * We've just woken up from a protentially long select sleep.
- * Ensure we process local messages as we need to synchronously
- * process any messages from other smbd's to avoid file rename race
- * conditions. This call is cheap if there are no messages waiting.
- * JRA.
- */
- message_dispatch(smbd_messaging_context());
-
/* Did we timeout ? */
if (selrtn == 0) {
return NT_STATUS_IO_TIMEOUT;
@@ -903,6 +894,15 @@ static NTSTATUS receive_message_or_smb(TALLOC_CTX *mem_ctx, char **buffer,
goto again;
}
+ /*
+ * We've just woken up from a protentially long select sleep.
+ * Ensure we process local messages as we need to synchronously
+ * process any messages from other smbd's to avoid file rename race
+ * conditions. This call is cheap if there are no messages waiting.
+ * JRA.
+ */
+ message_dispatch(smbd_messaging_context());
+
status = receive_smb_talloc(mem_ctx, smbd_server_fd(), buffer, 0,
p_unread, p_encrypted, &len);
--
Samba Shared Repository
More information about the samba-cvs
mailing list