Changeset 745 for trunk/server/source3/modules/onefs_cbrl.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/modules/onefs_cbrl.c (modified) (7 diffs)

trunk/server/source3/modules/onefs_cbrl.c

@@ -20 +20 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "onefs.h"
 
@@ -28 +29 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_LOCKING
-
-extern struct blocking_lock_record *blocking_lock_queue;
 
 static uint64_t onefs_get_new_id(void) {
@@ -85 +84 @@
 static void onefs_cbrl_enumerate_blq(const char *fn)
 {
+        struct smbd_server_connection *sconn = smbd_server_conn;
         struct blocking_lock_record *blr;
 
@@ -92 +92 @@
         DEBUG(10, ("CBRL BLR records (%s):\n", fn));
 
-        for (blr = blocking_lock_queue; blr; blr = blr->next)
-                DEBUGADD(10, ("%s\n", onefs_cbrl_blr_state_str(blr)));
+        if (sconn->using_smb2) {
+                struct smbd_smb2_request *smb2req;
+                for (smb2req = sconn->smb2.requests; smb2req; smb2req = nextreq) {
+                        blr = get_pending_smb2req_blr(smb2req);
+                        if (blr) {
+                                DEBUGADD(10, ("%s\n", onefs_cbrl_blr_state_str(blr)));
+                        }
+                }
+        } else {
+                for (blr = sconn->smb1.locks.blocking_lock_queue; blr; blr = blr->next)
+                        DEBUGADD(10, ("%s\n", onefs_cbrl_blr_state_str(blr)));
+        }
 }
 
 static struct blocking_lock_record *onefs_cbrl_find_blr(uint64_t id)
 {
+        struct smbd_server_connection *sconn = smbd_server_conn;
         struct blocking_lock_record *blr;
         struct onefs_cbrl_blr_state *bs;
@@ -103 +114 @@
         onefs_cbrl_enumerate_blq("onefs_cbrl_find_blr");
 
-        for (blr = blocking_lock_queue; blr; blr = blr->next) {
-                bs = (struct onefs_cbrl_blr_state *)blr->blr_private;
-
-                /* We don't control all of the BLRs on the BLQ. */
-                if (bs == NULL)
-                        continue;
-
-                if (bs->id == id) {
-                        DEBUG(10, ("found %s\n",
-                            onefs_cbrl_blr_state_str(blr)));
-                        break;
+        if (sconn->using_smb2) {
+                struct smbd_smb2_request *smb2req;
+                for (smb2req = sconn->smb2.requests; smb2req; smb2req = nextreq) {
+                        blr = get_pending_smb2req_blr(smb2req);
+                        if (!blr) {
+                                continue;
+                        }
+                        bs = (struct onefs_cbrl_blr_state *)blr->blr_private;
+                        if (bs == NULL) {
+                                continue;
+                        }
+                        if (bs->id == id) {
+                                DEBUG(10, ("found %s\n",
+                                    onefs_cbrl_blr_state_str(blr)));
+                                break;
+                        }
+                }
+        } else {
+                for (blr = sconn->smb1.locks.blocking_lock_queue; blr; blr = blr->next) {
+                        bs = (struct onefs_cbrl_blr_state *)blr->blr_private;
+
+                        /* We don't control all of the BLRs on the BLQ. */
+                        if (bs == NULL)
+                                continue;
+
+                        if (bs->id == id) {
+                                DEBUG(10, ("found %s\n",
+                                    onefs_cbrl_blr_state_str(blr)));
+                                break;
+                        }
                 }
         }
@@ -157 +187 @@
 
         /* Process the queue, to try the next lock or finish up. */
-        process_blocking_lock_queue();
+        process_blocking_lock_queue(smbd_server_conn);
 }
 
@@ -180 +210 @@
         /* Process the queue. It will end up trying to retake the same lock,
          * see the error in onefs_cbrl_lock_windows() and fail. */
-        process_blocking_lock_queue();
+        process_blocking_lock_queue(smbd_server_conn);
 }