[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  91b0ff7 smbd: Do not wait unnecessarily
       via  54d9ec7 smbd: Make break_level2_to_none_async static
       via  6c07582 tevent: Remove a pointless goto
      from  52ec52b loadparm: Use the new fully featured kcc by default

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


- Log -----------------------------------------------------------------
commit 91b0ff7e0095e06f92a0af0362419fcb8ab9f6cb
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Aug 16 13:01:10 2013 +0000

    smbd: Do not wait unnecessarily
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Fri Aug 16 18:46:36 CEST 2013 on sn-devel-104

commit 54d9ec751736cb19bd377e21853958eb89e8ef18
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Aug 16 12:47:10 2013 +0000

    smbd: Make break_level2_to_none_async static
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 6c0758219a8d3dc0c6673f8c7b38386dbbc75559
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Aug 16 11:32:08 2013 +0000

    tevent: Remove a pointless goto
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 lib/tevent/tevent_wakeup.c |    5 +----
 source3/smbd/oplock.c      |    4 ++--
 source3/smbd/proto.h       |    1 -
 3 files changed, 3 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tevent/tevent_wakeup.c b/lib/tevent/tevent_wakeup.c
index 82c3942..e217f33 100644
--- a/lib/tevent/tevent_wakeup.c
+++ b/lib/tevent/tevent_wakeup.c
@@ -46,12 +46,9 @@ struct tevent_req *tevent_wakeup_send(TALLOC_CTX *mem_ctx,
 	state->wakeup_time = wakeup_time;
 
 	if (!tevent_req_set_endtime(req, ev, wakeup_time)) {
-		goto post;
+		return tevent_req_post(req, ev);
 	}
-
 	return req;
-post:
-	return tevent_req_post(req, ev);
 }
 
 bool tevent_wakeup_recv(struct tevent_req *req)
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 05b0d0b..e08a963 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -388,7 +388,7 @@ static void send_break_message_smb1(files_struct *fsp, int level)
 	TALLOC_FREE(break_msg);
 }
 
-void break_level2_to_none_async(files_struct *fsp)
+static void break_level2_to_none_async(files_struct *fsp)
 {
 	struct smbd_server_connection *sconn = fsp->conn->sconn;
 
@@ -764,8 +764,8 @@ static void do_break_to_none(struct tevent_req *req)
 				initial_break_processing(state->sconn,
 					share_entry->id,
 					share_entry->share_file_id);
-			wait_before_sending_break();
 			if (cur_fsp != NULL) {
+				wait_before_sending_break();
 				break_level2_to_none_async(cur_fsp);
 			} else {
 				DEBUG(3, ("release_level_2_oplocks_on_change: "
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 9c76609..f572c35 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -664,7 +664,6 @@ void release_file_oplock(files_struct *fsp);
 bool remove_oplock(files_struct *fsp);
 bool downgrade_oplock(files_struct *fsp);
 bool should_notify_deferred_opens(struct smbd_server_connection *sconn);
-void break_level2_to_none_async(files_struct *fsp);
 void contend_level2_oplocks_begin(files_struct *fsp,
 				  enum level2_contention_type type);
 void contend_level2_oplocks_end(files_struct *fsp,


-- 
Samba Shared Repository