s3:smbd: move global oplocks vars to smbd_server_connection

[samba.git] / source3 / smbd / globals.h

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 0a57013a6800ff7b8ce564356c590cd358ceed94..f49cdbb473988447311cca2d938b8b3bc19f9f81 100644 (file)
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -108,9 +108,6 @@ extern struct vfs_init_function_entry *backends;
 extern char *sparse_buf;
 extern char *LastDir;
 
-/* Current number of oplocks we have outstanding. */
-extern int32_t exclusive_oplocks_open;
-extern int32_t level_II_oplocks_open;
 extern struct kernel_oplocks *koplocks;
 
 struct smbd_parent_context;
@@ -519,6 +516,12 @@ struct smbd_server_connection {
 
        uint64_t num_requests;
 
+       /* Current number of oplocks we have outstanding. */
+       struct {
+               int32_t exclusive_open;
+               int32_t level_II_open;
+       } oplocks;
+
        struct {
                struct fd_event *fde;
 
@@ -638,6 +641,6 @@ struct smbd_server_connection {
        struct smbXsrv_connection *conn;
 };
 
-extern struct smbd_server_connection *smbd_server_conn;
+extern struct smbXsrv_connection *global_smbXsrv_connection;
 
 void smbd_init_globals(void);