s3-krb5 Move #ifdef HAVE_KRB5 above #include of libcli/auth/krb5_wrap.h

[samba.git] / source3 / include / locking.h

diff --git a/source3/include/locking.h b/source3/include/locking.h
index 9e70411fa66649b125645002547a1c3f8c270c4b..77a04eee2b6170253f09f6c2e2966505f88d905a 100644 (file)
--- a/source3/include/locking.h
+++ b/source3/include/locking.h
@@ -6,7 +6,7 @@
    
    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 2 of the License, or
+   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,
@@ -15,58 +15,48 @@
    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, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _LOCKING_H
 #define _LOCKING_H
 
 /* passed to br lock code - the UNLOCK_LOCK should never be stored into the tdb
-   and is used in calculating POSIX unlock ranges only. */
+   and is used in calculating POSIX unlock ranges only. We differentiate between
+   PENDING read and write locks to allow posix lock downgrades to trigger a lock
+   re-evaluation. */
 
-enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_LOCK, UNLOCK_LOCK};
+enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_READ_LOCK, PENDING_WRITE_LOCK, UNLOCK_LOCK};
 enum brl_flavour {WINDOWS_LOCK = 0, POSIX_LOCK = 1};
 
+#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
    this client */
 
 struct lock_context {
-       uint32 smbpid;
+       uint64_t smblctx;
        uint16 tid;
-       struct process_id pid;
-};
-
-/* The key used in the brlock database. */
-
-struct lock_key {
-       SMB_DEV_T device;
-       SMB_INO_T inode;
+       struct server_id pid;
 };
 
 struct files_struct;
 
+#include "../librpc/gen_ndr/file_id.h"
+
 struct byte_range_lock {
        struct files_struct *fsp;
        unsigned int num_locks;
-       BOOL modified;
-       struct lock_key key;
-       void *lock_data;
+       bool modified;
+       bool read_only;
+       struct file_id key;
+       struct lock_struct *lock_data;
+       struct db_record *record;
 };
 
-#define BRLOCK_FN_CAST() \
-       void (*)(SMB_DEV_T dev, SMB_INO_T ino, struct process_id pid, \
-                                enum brl_type lock_type, \
-                                enum brl_flavour lock_flav, \
-                                br_off start, br_off size)
-
-#define BRLOCK_FN(fn) \
-       void (*fn)(SMB_DEV_T dev, SMB_INO_T ino, struct process_id pid, \
-                                enum brl_type lock_type, \
-                                enum brl_flavour lock_flav, \
-                                br_off start, br_off size)
-
 /* 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
@@ -81,4 +71,31 @@ struct lock_struct {
        enum brl_flavour lock_flav;
 };
 
+/****************************************************************************
+ This is the structure to queue to implement blocking locks.
+*****************************************************************************/
+
+struct blocking_lock_record {
+       struct blocking_lock_record *next;
+       struct blocking_lock_record *prev;
+       struct files_struct *fsp;
+       struct timeval expire_time;
+       int lock_num;
+       uint64_t offset;
+       uint64_t count;
+       uint64_t smblctx;
+       uint64_t blocking_smblctx; /* Context that blocks us. */
+       enum brl_flavour lock_flav;
+       enum brl_type lock_type;
+       struct smb_request *req;
+       void *blr_private; /* Implementation specific. */
+};
+
+struct smbd_lock_element {
+       uint64_t smblctx;
+       enum brl_type brltype;
+       uint64_t offset;
+       uint64_t count;
+};
+
 #endif /* _LOCKING_H_ */