[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  95c1355 Ensure we send the direct levelII oplock break to the correct fid. (cherry picked from commit 24883229e3ec6237d28b88a2bacc812e1e98b931)
      from  fe1f233 smbtorture4 test for bug #7928 - Samba problems with kernel oplocks option set to "no"

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 95c135509927f1a528721024acbc0eb6edbc0d23
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.
    (cherry picked from commit 24883229e3ec6237d28b88a2bacc812e1e98b931)

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

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