[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  6696fd1 Ensure we send the direct levelII oplock break to the correct fid.
      from  e18b8c0 Add knownfail for s4 for the new oplock test.

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


- Log -----------------------------------------------------------------
commit 6696fd1c1e94a6b830fe8d1191b85da97bfb10c1
Author: Pavel Shilovsky <piastry at etersoft.ru>
Date:   Mon Jan 31 14:52:11 2011 -0800

    Ensure we send the direct levelII oplock break to the correct fid.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Tue Feb  1 00:39:56 CET 2011 on sn-devel-104

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

Summary of changes:
 source3/smbd/oplock.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 31cedc4..c3c41d1 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -839,8 +839,17 @@ static void contend_level2_oplocks_begin_default(files_struct *fsp,
  		 */
 
 		if (procid_is_me(&share_entry->pid)) {
+			struct files_struct *cur_fsp =
+				initial_break_processing(fsp->conn->sconn,
+					share_entry->id,
+					share_entry->share_file_id);
 			wait_before_sending_break();
-			break_level2_to_none_async(fsp);
+			if (cur_fsp != NULL) {
+				break_level2_to_none_async(cur_fsp);
+			} else {
+				DEBUG(3, ("release_level_2_oplocks_on_change: "
+				"Did not find fsp, ignoring\n"));
+			}
 		} else {
 			messaging_send_buf(fsp->conn->sconn->msg_ctx,
 					share_entry->pid,


-- 
Samba Shared Repository