summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Boehme <slow@samba.org>2022-05-17 15:25:35 +0200
committerJule Anger <janger@samba.org>2022-06-09 08:53:10 +0000
commit7ae1fdcbb2f44210f1be3dabd7afc07b9b989b64 (patch)
tree8451b68b8bb1f6538007c252f086d6942fcfbd7c
parentae7e33885d79f862b9e29ee3cae0ef6e921d5db3 (diff)
downloadsamba-7ae1fdcbb2f44210f1be3dabd7afc07b9b989b64.tar.gz
vfs_gpfs: pass fsp to gpfs_get_nfs4_acl()
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15069 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Christof Schmitt <cs@samba.org> (cherry picked from commit 5f4625a2859bf622ea2034e5bbf63f9959e58b78)
-rw-r--r--source3/modules/vfs_gpfs.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index a7029e877da..b607578b354 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -523,9 +523,11 @@ again:
* On failure returns -1 if there is system (GPFS) error, check errno.
* Returns 0 on success
*/
-static int gpfs_get_nfs4_acl(TALLOC_CTX *mem_ctx, const char *fname,
+static int gpfs_get_nfs4_acl(TALLOC_CTX *mem_ctx,
+ struct files_struct *fsp,
struct SMB4ACL_T **ppacl)
{
+ const char *fname = fsp->fsp_name->base_name;
gpfs_aclCount_t i;
struct gpfs_acl *gacl = NULL;
DEBUG(10, ("gpfs_get_nfs4_acl invoked for %s\n", fname));
@@ -644,7 +646,7 @@ static NTSTATUS gpfsacl_fget_nt_acl(vfs_handle_struct *handle,
return status;
}
- result = gpfs_get_nfs4_acl(frame, fsp->fsp_name->base_name, &pacl);
+ result = gpfs_get_nfs4_acl(frame, fsp, &pacl);
if (result == 0) {
status = smb_fget_nt_acl_nfs4(fsp, &config->nfs4_params,
@@ -1272,7 +1274,7 @@ static int gpfsacl_emu_chmod(vfs_handle_struct *handle,
DEBUG(10, ("gpfsacl_emu_chmod invoked for %s mode %o\n", path, mode));
- result = gpfs_get_nfs4_acl(frame, path, &pacl);
+ result = gpfs_get_nfs4_acl(frame, fsp, &pacl);
if (result) {
TALLOC_FREE(frame);
return result;