]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
smbd: Remove share_mode_data->record
authorVolker Lendecke <vl@samba.org>
Mon, 4 Nov 2019 12:13:02 +0000 (13:13 +0100)
committerJeremy Allison <jra@samba.org>
Fri, 22 Nov 2019 23:57:47 +0000 (23:57 +0000)
In the future, there won't be a record anymore

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/librpc/idl/open_files.idl
source3/locking/share_mode_lock.c

index d3e537a9d4281da4b7e8c191ce85c86470e023f5..8742a38dfa6832def22eb53d640642b0a86aa5d5 100644 (file)
@@ -65,7 +65,6 @@ interface open_files
                timespec changed_write_time;
                [skip] boolean8 fresh;
                [skip] boolean8 modified;
-               [ignore] db_record *record;
                [ignore] file_id id; /* In memory key used to lookup cache. */
        } share_mode_data;
 
index 3046fe775a85013c7a49bde53e6c5e4017ed0b3a..defa538b452dc68fe549f3a4613093a1b56457e8 100644 (file)
@@ -564,7 +564,6 @@ static NTSTATUS get_static_share_mode_data(
        }
 
        d->id = id;
-       d->record = rec;
 
        static_share_mode_data = d;
 
@@ -685,13 +684,6 @@ static int share_mode_lock_destructor(struct share_mode_lock *lck)
                smb_panic("Could not store share mode data\n");
        }
 
-       /*
-        * Drop the locking.tdb lock before moving the share_mode_data
-        * to memcache
-        */
-       SMB_ASSERT(static_share_mode_data->record == static_share_mode_record);
-       static_share_mode_data->record = NULL;
-
        if (static_share_mode_record_talloced) {
                TALLOC_FREE(static_share_mode_record);
        }