From: Jeremy Allison Date: Wed, 18 Mar 2020 23:07:56 +0000 (-0700) Subject: s3: VFS: Remove deferred_close from struct files_struct. X-Git-Tag: ldb-2.2.0~1289 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6efda217c5adc5d76c0752823326c7fdfef701d;p=thirdparty%2Fsamba.git s3: VFS: Remove deferred_close from struct files_struct. Bump up the VFS number to 43. Samba 4.13 will ship with that. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- diff --git a/source3/include/vfs.h b/source3/include/vfs.h index fec38f20644..85da21513fc 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -290,8 +290,10 @@ /* Version 42 - SMB_VFS_NTIMES() receives null times based on UTIMES_OMIT */ /* Version 42 - Add SMB_VFS_CREATE_DFS_PATHAT() */ /* Version 42 - Add SMB_VFS_READ_DFS_PATHAT() */ +/* Change to Version 43 - will ship with 4.13. */ +/* Version 43 - Remove deferred_close from struct files_struct */ -#define SMB_VFS_INTERFACE_VERSION 42 +#define SMB_VFS_INTERFACE_VERSION 43 /* All intercepted VFS operations must be declared as static functions inside module source @@ -441,15 +443,6 @@ typedef struct files_struct { */ bool lock_failure_seen; uint64_t lock_failure_offset; - - /* - * If a close request comes in while we still have aio_requests - * around, we need to hold back the close. When all aio_requests are - * done, the aio completion routines need tevent_wait_done() on - * this. A bit ugly, but before we have close_file() fully async - * possibly the simplest approach. Thanks, Jeremy for the idea. - */ - struct tevent_req *deferred_close; } files_struct; #define FSP_POSIX_FLAGS_OPEN 0x01