From e4305846e7fb3963336189f30839811424151c84 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 8 Oct 2014 09:06:06 -0700 Subject: [PATCH] s3: smbd: Preparation for leases code merge. Ensure VFS is ready for 4.2.0. Signed-off-by: Jeremy Allison Reviewed-by: Volker Lendecke Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri Oct 10 02:55:53 CEST 2014 on sn-devel-104 (cherry picked from commit aa2a6c7b18e2e2bd3979ffb53208564764b8b9cf) --- source3/include/vfs.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 3702b75464e..b0f00e88627 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; -- 2.11.4.GIT