summaryrefslogtreecommitdiffstats
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2014-10-08 09:06:06 -0700
committerJeremy Allison <jra@samba.org>2014-10-10 02:55:52 +0200
commitaa2a6c7b18e2e2bd3979ffb53208564764b8b9cf (patch)
tree83a08b6b43ae144786851482c3a03797dcb8fb3a /source3/include
parentfa331f64d1a40350496c7acf68c20cb3fead6eaf (diff)
downloadsamba-aa2a6c7b18e2e2bd3979ffb53208564764b8b9cf.tar.gz
samba-aa2a6c7b18e2e2bd3979ffb53208564764b8b9cf.tar.xz
samba-aa2a6c7b18e2e2bd3979ffb53208564764b8b9cf.zip
s3: smbd: Preparation for leases code merge. Ensure VFS is ready for 4.2.0.
Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Fri Oct 10 02:55:53 CEST 2014 on sn-devel-104
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/vfs.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 3702b75464..b0f00e8862 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -158,6 +158,7 @@
/* Bump to version 32 - Samba 4.2 will ship with that. */
/* Version 32 - Add "lease" to CREATE_FILE operation */
+/* Version 32 - Add "lease" to struct files_struct */
#define SMB_VFS_INTERFACE_VERSION 32
@@ -202,6 +203,11 @@ struct fd_handle {
unsigned long gen_id;
};
+struct fsp_lease {
+ size_t ref_count;
+ struct smb2_lease lease;
+};
+
typedef struct files_struct {
struct files_struct *next, *prev;
uint64_t fnum;
@@ -225,6 +231,7 @@ typedef struct files_struct {
bool write_time_forced;
int oplock_type;
+ struct fsp_lease *lease; /* Not yet used. Placeholder for leases. */
int sent_oplock_break;
struct tevent_timer *oplock_timeout;
struct lock_struct last_lock_failure;