From: Ralph Boehme <slow@samba.org>
Date: Fri, 11 Dec 2020 12:00:09 +0000 (+0100)
Subject: vfs_fruit: use "fake_fd" instead of "created"
X-Git-Tag: samba-4.14.0rc1~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36eb30fd7d4b82bffd0e1ab471c088f678d700a4;p=thirdparty%2Fsamba.git

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 <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 7ea8da3d048..0cf819f7f78 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
@@ -2236,7 +2233,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];
 
@@ -3938,7 +3935,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;
 
@@ -4011,11 +4007,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->fsp_flags.is_directory) {
 		return status;
 	}