From: Volker Lendecke <vl@samba.org>
Date: Fri, 26 Jul 2019 17:18:37 +0000 (+0200)
Subject: smbd: Remove "id" from deferred_open_record_create()
X-Git-Tag: tdb-1.4.2~282
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61765c7e15b52df9c18541cf8604887f2d558bde;p=thirdparty%2Fsamba.git

smbd: Remove "id" from deferred_open_record_create()

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

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index d60880930c6..cc49fe11e01 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2387,8 +2387,7 @@ static bool request_timed_out(struct smb_request *req, struct timeval timeout)
 
 static struct deferred_open_record *deferred_open_record_create(
 	bool delayed_for_oplocks,
-	bool async_open,
-	struct file_id id)
+	bool async_open)
 {
 	struct deferred_open_record *record = NULL;
 
@@ -2444,9 +2443,7 @@ static void defer_open(struct share_mode_lock *lck,
 		  delayed_for_oplocks ? "yes" : "no",
 		  file_id_string_tos(&id));
 
-	open_rec = deferred_open_record_create(delayed_for_oplocks,
-					       false,
-					       id);
+	open_rec = deferred_open_record_create(delayed_for_oplocks, false);
 	if (open_rec == NULL) {
 		TALLOC_FREE(lck);
 		exit_server("talloc failed");
@@ -2544,7 +2541,7 @@ static void setup_kernel_oplock_poll_open(struct smb_request *req,
 		return;
 	}
 
-	open_rec = deferred_open_record_create(false, false, id);
+	open_rec = deferred_open_record_create(false, false);
 	if (open_rec == NULL) {
 		exit_server("talloc failed");
 	}
@@ -2667,7 +2664,7 @@ static void schedule_async_open(struct smb_request *req)
 		return;
 	}
 
-	open_rec = deferred_open_record_create(false, true, (struct file_id){0});
+	open_rec = deferred_open_record_create(false, true);
 	if (open_rec == NULL) {
 		exit_server("deferred_open_record_create failed");
 	}