From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 22 Aug 2022 14:53:38 +0000 (+0200)
Subject: s3:locking: replace locking_tdb_data_store() with share_mode_data_ltdb_store()
X-Git-Tag: talloc-2.4.0~906
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4e0a6fe00bc61b052ab3f1094bbce113e127d1d;p=thirdparty%2Fsamba.git

s3:locking: replace locking_tdb_data_store() with share_mode_data_ltdb_store()

This means we flush share_mode_data at the same time...

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15125

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c
index 3bcf2b12c79..939afe430c8 100644
--- a/source3/locking/share_mode_lock.c
+++ b/source3/locking/share_mode_lock.c
@@ -1977,10 +1977,10 @@ bool set_share_mode(struct share_mode_lock *lck,
 	ltdb->share_entries = NULL;
 	ltdb->num_share_entries = 0;
 
-	status = locking_tdb_data_store(key, ltdb, dbufs, num_dbufs);
+	status = share_mode_data_ltdb_store(d, key, ltdb, dbufs, num_dbufs);
 	if (!NT_STATUS_IS_OK(status)) {
-		DBG_DEBUG("locking_tdb_data_store failed: %s\n",
-			  nt_errstr(status));
+		DBG_ERR("share_mode_data_ltdb_store failed: %s\n",
+			nt_errstr(status));
 	}
 done:
 	TALLOC_FREE(ltdb);
@@ -2149,10 +2149,10 @@ bool share_mode_forall_entries(
 	ltdb->num_share_entries = num_share_entries;
 	ltdb->share_entries = share_entries;
 
-	status = locking_tdb_data_store(key, ltdb, NULL, 0);
+	status = share_mode_data_ltdb_store(d, key, ltdb, NULL, 0);
 	TALLOC_FREE(ltdb);
 	if (!NT_STATUS_IS_OK(status)) {
-		DBG_ERR("locking_tdb_data_store failed: %s\n",
+		DBG_ERR("share_mode_data_ltdb_store failed: %s\n",
 			nt_errstr(status));
 		return false;
 	}
@@ -2320,9 +2320,9 @@ static bool share_mode_entry_do(
 		memcpy(e_ptr, buf.buf, SHARE_MODE_ENTRY_SIZE);
 	}
 
-	status = locking_tdb_data_store(key, ltdb, NULL, 0);
+	status = share_mode_data_ltdb_store(d, key, ltdb, NULL, 0);
 	if (!NT_STATUS_IS_OK(status)) {
-		DBG_ERR("locking_tdb_data_store failed: %s\n",
+		DBG_ERR("share_mode_data_ltdb_store failed: %s\n",
 			nt_errstr(status));
 		goto done;
 	}
@@ -2551,14 +2551,15 @@ bool reset_share_mode_entry(
 
 	ltdb->share_entries = e_buf.buf;
 
-	status = locking_tdb_data_store(key, ltdb, NULL, 0);
+	d->modified = true;
+
+	status = share_mode_data_ltdb_store(d, key, ltdb, NULL, 0);
 	if (!NT_STATUS_IS_OK(status)) {
-		DBG_ERR("locking_tdb_data_store failed: %s\n",
+		DBG_ERR("share_mode_data_ltdb_store failed: %s\n",
 			nt_errstr(status));
 		goto done;
 	}
 
-	d->modified = true;
 	ret = true;
 done:
 	TALLOC_FREE(ltdb);