From: Christof Schmitt <cs@samba.org>
Date: Mon, 20 Sep 2021 22:46:21 +0000 (-0700)
Subject: smbd: Rename return variable for requesting filesystem sharemode
X-Git-Tag: ldb-2.5.0~603
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa3f952f3e7d27a0977f497ce96ef8484c2f1111;p=thirdparty%2Fsamba.git

smbd: Rename return variable for requesting filesystem sharemode

flock is no longer used, rename the variable accordingly.

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 8318972286d..1f51e93b07b 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -4049,7 +4049,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
 	    fsp_get_io_fd(fsp) != -1 &&
 	    lp_kernel_share_modes(SNUM(conn)))
 	{
-		int ret_flock;
+		int ret;
 		/*
 		 * Beware: streams implementing VFS modules may
 		 * implement streams in a way that fsp will have the
@@ -4059,11 +4059,10 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
 		 * check is deferred to the VFS module implementing
 		 * the file-system sharemode call.
 		 */
-		ret_flock = SMB_VFS_FILESYSTEM_SHAREMODE(fsp,
-							 share_access,
-							 access_mask);
-		if(ret_flock == -1 ){
-
+		ret = SMB_VFS_FILESYSTEM_SHAREMODE(fsp,
+						   share_access,
+						   access_mask);
+		if (ret == -1){
 			del_share_mode(lck, fsp);
 			TALLOC_FREE(lck);
 			fd_close(fsp);