Changeset 745 for trunk/server/source3/smbd/oplock_irix.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_irix.c (modified) (3 diffs)

trunk/server/source3/smbd/oplock_irix.c

@@ -20 +20 @@
 #define DBGC_CLASS DBGC_LOCKING
 #include "includes.h"
+#include "system/filesys.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 
@@ -183 +185 @@
         fileid = file_id_create_dev((SMB_DEV_T)os.os_dev,
                                     (SMB_INO_T)os.os_ino);
-        if ((fsp = file_find_di_first(fileid)) == NULL) {
+        if ((fsp = file_find_di_first(smbd_server_conn, fileid)) == NULL) {
                 DEBUG(0,("irix_oplock_receive_message: unable to find open "
                          "file with dev = %x, inode = %.0f\n",
@@ -284 +286 @@
 
         fsp = irix_oplock_receive_message(ctx->ctx);
-        break_kernel_oplock(smbd_messaging_context(), fsp);
+        break_kernel_oplock(fsp->conn->sconn->msg_ctx, fsp);
 }