From: Volker Lendecke <vl@samba.org>
Date: Mon, 4 Nov 2019 06:39:48 +0000 (+0100)
Subject: smbd: Use file_id_str_buf() in set_file_oplock()
X-Git-Tag: talloc-2.3.1~117
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c7731649fde2b2336bba3de7e38a9281b3330414;p=thirdparty%2Fsamba.git

smbd: Use file_id_str_buf() in set_file_oplock()

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

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 232e243cfce..536470afb22 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -58,7 +58,7 @@ NTSTATUS set_file_oplock(files_struct *fsp)
 	struct kernel_oplocks *koplocks = sconn->oplocks.kernel_ops;
 	bool use_kernel = lp_kernel_oplocks(SNUM(fsp->conn)) &&
 			(koplocks != NULL);
-	file_id_buf buf;
+	struct file_id_buf buf;
 
 	if (fsp->oplock_type == LEVEL_II_OPLOCK && use_kernel) {
 		DEBUG(10, ("Refusing level2 oplock, kernel oplocks "
@@ -220,10 +220,12 @@ bool remove_oplock(files_struct *fsp)
 
 	ret = remove_share_oplock(lck, fsp);
 	if (!ret) {
+		struct file_id_buf buf;
+
 		DBG_ERR("failed to remove share oplock for "
 			"file %s, %s, %s\n",
 			fsp_str_dbg(fsp), fsp_fnum_dbg(fsp),
-			file_id_string_tos(&fsp->file_id));
+			file_id_str_buf(fsp->file_id, &buf));
 	}
 	release_file_oplock(fsp);