The branch, master has been updated
via aa2a6c7 s3: smbd: Preparation for leases code merge. Ensure VFS is
ready for 4.2.0.
from fa331f6 pidl-wireshark: insure that we have an entire match for the
variable name
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit aa2a6c7b18e2e2bd3979ffb53208564764b8b9cf
Author: Jeremy Allison <j...@samba.org>
Date: Wed Oct 8 09:06:06 2014 -0700
s3: smbd: Preparation for leases code merge. Ensure VFS is ready for 4.2.0.
Signed-off-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Volker Lendecke <v...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Fri Oct 10 02:55:53 CEST 2014 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/include/vfs.h | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 3702b75..b0f00e8 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;
--
Samba Shared Repository
