Changeset 232 for branches/samba-3.2.x/source/smbd/oplock.c

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

File:

• branches/samba-3.2.x/source/smbd/oplock.c (modified) (5 diffs)

branches/samba-3.2.x/source/smbd/oplock.c

@@ -105 +105 @@
 bool set_file_oplock(files_struct *fsp, int oplock_type)
 {
-        if (koplocks && !koplocks->set_oplock(fsp, oplock_type)) {
+        if ((fsp->oplock_type != NO_OPLOCK) &&
+            (fsp->oplock_type != FAKE_LEVEL_II_OPLOCK) &&
+            koplocks &&
+            !koplocks->set_oplock(fsp, oplock_type)) {
                 return False;
         }
@@ -113 +116 @@
         if (oplock_type == LEVEL_II_OPLOCK) {
                 level_II_oplocks_open++;
-        } else {
+        } else if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
                 exclusive_oplocks_open++;
         }
@@ -146 +149 @@
         SMB_ASSERT(exclusive_oplocks_open>=0);
         SMB_ASSERT(level_II_oplocks_open>=0);
-        
-        fsp->oplock_type = NO_OPLOCK;
+
+        if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
+                /* This doesn't matter for close. */
+                fsp->oplock_type = FAKE_LEVEL_II_OPLOCK;
+        } else {
+                fsp->oplock_type = NO_OPLOCK;
+        }
         fsp->sent_oplock_break = NO_BREAK_SENT;
-        
+
         flush_write_cache(fsp, OPLOCK_RELEASE_FLUSH);
 
@@ -436 +444 @@
         SMB_ASSERT(fsp->oplock_type == LEVEL_II_OPLOCK);
 
+        DEBUG(10,("process_oplock_async_level2_break_message: sending break to "
+                "none message for fid %d, file %s\n",
+                fsp->fnum,
+                fsp->fsp_name));
+
         /* Now send a break to none message to our client. */
 
@@ -809 +822 @@
                 share_mode_entry_to_message(msg, share_entry);
 
-                messaging_send_buf(smbd_messaging_context(), share_entry->pid,
-                                   MSG_SMB_ASYNC_LEVEL2_BREAK,
-                                   (uint8 *)msg,
-                                   MSG_SMB_SHARE_MODE_ENTRY_SIZE);
+                /*
+                 * Deal with a race condition when breaking level2
+                 * oplocks. Don't send all the messages and release
+                 * the lock, this allows someone else to come in and
+                 * get a level2 lock before any of the messages are
+                 * processed, and thus miss getting a break message.
+                 * Ensure at least one entry (the one we're breaking)
+                 * is processed immediately under the lock and becomes
+                 * set as NO_OPLOCK to stop any waiter getting a level2.
+                 * Bugid #5980.
+                 */
+
+                if (procid_is_me(&share_entry->pid)) {
+                        DATA_BLOB blob = data_blob_const(msg,
+                                        MSG_SMB_SHARE_MODE_ENTRY_SIZE);
+                        process_oplock_async_level2_break_message(smbd_messaging_context(),
+                                                NULL,
+                                                MSG_SMB_ASYNC_LEVEL2_BREAK,
+                                                share_entry->pid,
+                                                &blob);
+                } else {
+                        messaging_send_buf(smbd_messaging_context(),
+                                        share_entry->pid,
+                                        MSG_SMB_ASYNC_LEVEL2_BREAK,
+                                        (uint8 *)msg,
+                                        MSG_SMB_SHARE_MODE_ENTRY_SIZE);
+                }
         }