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

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

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

vendor/current/source3/include/locking.h

@@ -1 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    SMB parameters and setup, plus a whole lot more.
-   
+
    Copyright (C) Jeremy Allison   2006
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -40 +40 @@
 struct lock_context {
         uint64_t smblctx;
-        uint16 tid;
+        uint32_t tid;
         struct server_id pid;
 };
@@ -46 +46 @@
 struct files_struct;
 
-#include "../librpc/gen_ndr/file_id.h"
+#include "lib/file_id.h"
 
-struct byte_range_lock {
-        struct files_struct *fsp;
-        unsigned int num_locks;
-        bool modified;
-        bool read_only;
-        struct file_id key;
-        struct lock_struct *lock_data;
-        struct db_record *record;
-};
+struct byte_range_lock;
 
-/* Internal structure in brlock.tdb. 
+/* Internal structure in brlock.tdb.
    The data in brlock records is an unsorted linear array of these
    records.  It is unnecessary to store the count as tdb provides the
@@ -67 +59 @@
         br_off start;
         br_off size;
-        uint16 fnum;
+        uint64_t fnum;
         enum brl_type lock_type;
         enum brl_flavour lock_flav;
@@ -99 +91 @@
 };
 
+struct share_mode_lock {
+        struct share_mode_data *data;
+};
+
 #endif /* _LOCKING_H_ */