Changeset 745 for trunk/server/source3/smbd/oplock_onefs.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/oplock_onefs.c (modified) (11 diffs)

trunk/server/source3/smbd/oplock_onefs.c

@@ -26 +26 @@
 #if HAVE_ONEFS
 #include "oplock_onefs.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 
@@ -50 +51 @@
         union {
                 files_struct *fsp;      /* ONEFS_OPEN_FILE */
-                uint16_t mid;           /* ONEFS_WAITING_FOR_OPLOCK */
+                uint64_t mid;           /* ONEFS_WAITING_FOR_OPLOCK */
         } data;
 };
@@ -79 +80 @@
         case ONEFS_WAITING_FOR_OPLOCK:
                 result = talloc_asprintf(talloc_tos(), "cb record %llu for "
-                                         "pending mid %d", r->id,
-                                         (int)r->data.mid);
+                                         "pending mid %llu", r->id,
+                                         (unsigned long long)r->data.mid);
                 break;
         default:
@@ -197 +198 @@
  *   transitioned to this state via onefs_set_oplock_callback.
  */
-uint64_t onefs_oplock_wait_record(uint16_t mid)
+uint64_t onefs_oplock_wait_record(uint64_t mid)
 {
         struct onefs_callback_record *result;
@@ -251 +252 @@
         if (open_was_deferred(cb->data.mid)) {
                 if (asprintf(&msg, "Trying to upgrade callback for deferred "
-                             "open mid=%d\n", cb->data.mid) != -1) {
+                             "open mid=%llu\n", (unsigned long long)cb->data.mid) != -1) {
                         smb_panic(msg);
                 }
@@ -381 +382 @@
                  "revoking oplock\n", fsp_str_dbg(fsp)));
 
-        global_client_failed_oplock_break = True;
         remove_oplock(fsp);
 
@@ -408 +408 @@
         }
 
-        DEBUG(10, ("Got semlock available for mid %d\n", cb->data.mid));
+        DEBUG(10, ("Got semlock available for mid %llu\n",
+                (unsigned long long)cb->data.mid));
 
         /* Paranoia check */
@@ -441 +442 @@
 {
         struct onefs_callback_record *cb;
-        struct pending_message_list *pml;
         struct deferred_open_record *state;
 
@@ -452 +452 @@
         }
 
-        DEBUG(1, ("Got semlock_async_failure message for mid %d\n", cb->data.mid));
+        DEBUG(1, ("Got semlock_async_failure message for mid %llu\n",
+                (unsigned long long)cb->data.mid));
 
         /* Paranoia check */
@@ -466 +467 @@
 
         /* Find the actual deferred open record. */
-        if (!(pml = get_open_deferred_message(cb->data.mid))) {
+        if (!get_open_deferred_message_state(cb->data.mid, NULL, &state)) {
                 DEBUG(0, ("Could not find deferred request for "
                           "mid %d\n", cb->data.mid));
@@ -472 +473 @@
                 return;
         }
-        state = (struct deferred_open_record *)pml->private_data.data;
 
         /* Update to failed so the client can be notified on retried open. */