]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
vfs_fruit: use "fake_fd" instead of "created"
authorRalph Boehme <slow@samba.org>
Fri, 11 Dec 2020 12:00:09 +0000 (13:00 +0100)
committerJeremy Allison <jra@samba.org>
Fri, 8 Jan 2021 20:31:33 +0000 (20:31 +0000)
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>
source3/modules/vfs_fruit.c

index 7ea8da3d0488b1cf91d97ed7bf4844a225fb9a34..0cf819f7f780a6a7dc91136ca930d764c1c37887 100644 (file)
@@ -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;
        }