From: Christof Schmitt <cs@samba.org>
Date: Fri, 3 Jan 2020 19:45:06 +0000 (-0700)
Subject: vfs_gpfs: Rename argument of flock function
X-Git-Tag: ldb-2.1.0~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86c2578a55507804f7ccd7d3a9656ceaa90fb302;p=thirdparty%2Fsamba.git

vfs_gpfs: Rename argument of flock function

MS-SMB2 and the smbd code refer to this field as share_access. Use the
same name in the function argument.

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

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 25df3266902..0825b71e634 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -132,7 +132,7 @@ static bool set_gpfs_sharemode(files_struct *fsp, uint32_t access_mask,
 }
 
 static int vfs_gpfs_kernel_flock(vfs_handle_struct *handle, files_struct *fsp,
-				 uint32_t share_mode, uint32_t access_mask)
+				 uint32_t share_access, uint32_t access_mask)
 {
 
 	struct gpfs_config_data *config;
@@ -158,9 +158,9 @@ static int vfs_gpfs_kernel_flock(vfs_handle_struct *handle, files_struct *fsp,
 		return 0;
 	}
 
-	kernel_flock(fsp->fh->fd, share_mode, access_mask);
+	kernel_flock(fsp->fh->fd, share_access, access_mask);
 
-	if (!set_gpfs_sharemode(fsp, access_mask, share_mode)) {
+	if (!set_gpfs_sharemode(fsp, access_mask, share_access)) {
 		ret = -1;
 	}