From 00b37ef3cdf78236dbd2289e702a3fca89dba1a6 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Fri, 11 Dec 2020 13:00:09 +0100 Subject: [PATCH] vfs_fruit: use "fake_fd" instead of "created" Both have basically the same semantics. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14596 Signed-off-by: Ralph Boehme Reviewed-by: Stefan Metzmacher Reviewed-by: Jeremy Allison (back-ported from commit 36eb30fd7d4b82bffd0e1ab471c088f678d700a4) --- source3/modules/vfs_fruit.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c index a376cc2f82d..a61a7393ada 100644 --- a/source3/modules/vfs_fruit.c +++ b/source3/modules/vfs_fruit.c @@ -178,9 +178,6 @@ struct fio { /* Denote stream type, meta or rsrc */ adouble_type_t type; - /* Whether the create created the stream */ - bool created; - /* * AFP_AfpInfo stream created, but not written yet, thus still a fake * pipe fd. This is set to true in fruit_open_meta if there was no @@ -2300,7 +2297,7 @@ static ssize_t fruit_pread_meta(vfs_handle_struct *handle, return -1; } - if (nread == -1 && fio->created) { + if (nread == -1 && fio->fake_fd) { AfpInfo *ai = NULL; char afpinfo_buf[AFP_INFO_SIZE]; @@ -3999,7 +3996,6 @@ static NTSTATUS fruit_create_file(vfs_handle_struct *handle, NTSTATUS status; struct fruit_config_data *config = NULL; files_struct *fsp = NULL; - struct fio *fio = NULL; bool internal_open = (oplock_request & INTERNAL_OPEN_ONLY); int ret; @@ -4072,11 +4068,6 @@ static NTSTATUS fruit_create_file(vfs_handle_struct *handle, goto fail; } - fio = (struct fio *)VFS_FETCH_FSP_EXTENSION(handle, fsp); - if (fio != NULL && pinfo != NULL && *pinfo == FILE_WAS_CREATED) { - fio->created = true; - } - if (is_named_stream(smb_fname) || fsp->is_directory) { return status; -- 2.47.2