Changeset 740 for vendor/current/source3/include/locking.h

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/include/locking.h (modified) (5 diffs)

vendor/current/source3/include/locking.h

@@ -32 +32 @@
 #define IS_PENDING_LOCK(type) ((type) == PENDING_READ_LOCK || (type) == PENDING_WRITE_LOCK)
 
+#include "librpc/gen_ndr/server_id.h"
+
 /* This contains elements that differentiate locks. The smbpid is a
    client supplied pid, and is essentially the locking context for
@@ -37 +39 @@
 
 struct lock_context {
-        uint32 smbpid;
+        uint64_t smblctx;
         uint16 tid;
         struct server_id pid;
@@ -44 +46 @@
 struct files_struct;
 
-struct file_id {
-        /* we don't use SMB_DEV_T and SMB_INO_T as we want a fixed size here,
-           and we may be using file system specific code to fill in something
-           other than a dev_t for the device */
-        uint64_t devid;
-        uint64_t inode;
-        uint64_t extid; /* Support systems that use an extended id (e.g. snapshots). */
-};
+#include "../librpc/gen_ndr/file_id.h"
 
 struct byte_range_lock {
@@ -89 +84 @@
         uint64_t offset;
         uint64_t count;
-        uint32_t lock_pid;
-        uint32_t blocking_pid; /* PID that blocks us. */
+        uint64_t smblctx;
+        uint64_t blocking_smblctx; /* Context that blocks us. */
         enum brl_flavour lock_flav;
         enum brl_type lock_type;
@@ -97 +92 @@
 };
 
+struct smbd_lock_element {
+        uint64_t smblctx;
+        enum brl_type brltype;
+        uint64_t offset;
+        uint64_t count;
+};
+
 #endif /* _LOCKING_H_ */