Changeset 224 for branches/samba-3.3.x/source/smbd/oplock.c

Timestamp:

May 24, 2009, 7:55:48 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.4

File:

• branches/samba-3.3.x/source/smbd/oplock.c (modified) (7 diffs)

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

@@ -413 +413 @@
         message_to_share_mode_entry(&msg, (char *)data->data);
 
-        DEBUG(10, ("Got oplock async level 2 break message from pid %d: %s/%lu\n",
-                   (int)procid_to_pid(&src), file_id_string_tos(&msg.id), msg.share_file_id));
+        DEBUG(10, ("Got oplock async level 2 break message from pid %s: "
+                   "%s/%lu\n", procid_str(debug_ctx(), &src),
+                   file_id_string_tos(&msg.id), msg.share_file_id));
 
         fsp = initial_break_processing(msg.id, msg.share_file_id);
@@ -456 +457 @@
 
         /* Need to wait before sending a break message if we sent ourselves this message. */
-        if (procid_to_pid(&src) == sys_getpid()) {
+        if (procid_is_me(&src)) {
                 wait_before_sending_break();
         }
@@ -508 +509 @@
         message_to_share_mode_entry(&msg, (char *)data->data);
 
-        DEBUG(10, ("Got oplock break message from pid %d: %s/%lu\n",
-                   (int)procid_to_pid(&src), file_id_string_tos(&msg.id), msg.share_file_id));
+        DEBUG(10, ("Got oplock break message from pid %s: %s/%lu\n",
+                   procid_str(debug_ctx(), &src), file_id_string_tos(&msg.id),
+                   msg.share_file_id));
 
         fsp = initial_break_processing(msg.id, msg.share_file_id);
@@ -563 +565 @@
 
         /* Need to wait before sending a break message if we sent ourselves this message. */
-        if (procid_to_pid(&src) == sys_getpid()) {
+        if (procid_is_me(&src)) {
                 wait_before_sending_break();
         }
@@ -622 +624 @@
         file_id = (unsigned long)IVAL(data->data, 16);
 
-        DEBUG(10, ("Got kernel oplock break message from pid %d: %s/%u\n",
-                   (int)procid_to_pid(&src), file_id_string_tos(&id),
+        DEBUG(10, ("Got kernel oplock break message from pid %s: %s/%u\n",
+                   procid_str(debug_ctx(), &src), file_id_string_tos(&id),
                    (unsigned int)file_id));
 
@@ -714 +716 @@
         message_to_share_mode_entry(&msg, (char *)data->data);
 
-        DEBUG(10, ("Got oplock break response from pid %d: %s/%lu mid %u\n",
-                   (int)procid_to_pid(&src), file_id_string_tos(&msg.id), msg.share_file_id,
-                   (unsigned int)msg.op_mid));
+        DEBUG(10, ("Got oplock break response from pid %s: %s/%lu mid %u\n",
+                   procid_str(debug_ctx(), &src), file_id_string_tos(&msg.id),
+                   msg.share_file_id, (unsigned int)msg.op_mid));
 
         /* Here's the hack from open.c, store the mid in the 'port' field */
@@ -743 +745 @@
         message_to_share_mode_entry(&msg, (char *)data->data);
 
-        DEBUG(10, ("Got open retry msg from pid %d: %s mid %u\n",
-                   (int)procid_to_pid(&src), file_id_string_tos(&msg.id),
+        DEBUG(10, ("Got open retry msg from pid %s: %s mid %u\n",
+                   procid_str(debug_ctx(), &src), file_id_string_tos(&msg.id),
                    (unsigned int)msg.op_mid));