From: Volker Lendecke <vl@samba.org>
Date: Fri, 22 Nov 2019 10:55:52 +0000 (+0100)
Subject: g_lock: Factor out g_lock_cleanup_shared()
X-Git-Tag: ldb-2.1.0~610
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f849d8c0cf7b8f04dd53cad4f633628c41565d2c;p=thirdparty%2Fsamba.git

g_lock: Factor out g_lock_cleanup_shared()

This function will find a second user soon

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index a05bb443b41..ae7a478d148 100644
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -266,6 +266,34 @@ static ssize_t g_lock_find_shared(
 	return -1;
 }
 
+static void g_lock_cleanup_shared(struct g_lock *lck)
+{
+	size_t i;
+	struct server_id check;
+	bool exists;
+
+	if (lck->num_shared == 0) {
+		return;
+	}
+
+	/*
+	 * Read locks can stay around forever if the process dies. Do
+	 * a heuristic check for process existence: Check one random
+	 * process for existence. Hopefully this will keep runaway
+	 * read locks under control.
+	 */
+	i = generate_random() % lck->num_shared;
+	g_lock_get_shared(lck, i, &check);
+
+	exists = serverid_exists(&check);
+	if (!exists) {
+		struct server_id_buf tmp;
+		DBG_DEBUG("Shared locker %s died -- removing\n",
+			  server_id_str_buf(check, &tmp));
+		g_lock_del_shared(lck, i);
+	}
+}
+
 struct g_lock_lock_state {
 	struct tevent_context *ev;
 	struct g_lock_ctx *ctx;
@@ -295,10 +323,8 @@ static NTSTATUS g_lock_trylock(
 	enum g_lock_type type = req_state->type;
 	bool retry = req_state->retry;
 	struct g_lock lck = { .exclusive.pid = 0 };
-	struct server_id check;
 	struct server_id_buf tmp;
 	NTSTATUS status;
-	size_t i;
 	bool exists;
 	bool ok;
 
@@ -465,31 +491,7 @@ do_shared:
 		return status;
 	}
 
-	/*
-	 * Read locks can stay around forever if the process dies. Do
-	 * a heuristic check for process existence: Check one random
-	 * process for existence. Hopefully this will keep runaway
-	 * read locks under control.
-	 */
-
-	i = generate_random() % lck.num_shared;
-
-	g_lock_get_shared(&lck, i, &check);
-
-	if (!serverid_exists(&check)) {
-
-		DBG_DEBUG("Shared locker %s died -- removing\n",
-			  server_id_str_buf(check, &tmp));
-
-		g_lock_del_shared(&lck, i);
-
-		status = g_lock_store(rec, &lck, NULL);
-		if (!NT_STATUS_IS_OK(status)) {
-			DBG_DEBUG("g_lock_store() failed: %s\n",
-				  nt_errstr(status));
-			return status;
-		}
-	}
+	g_lock_cleanup_shared(&lck);
 
 	status = g_lock_store(rec, &lck, &self);
 	if (!NT_STATUS_IS_OK(status)) {