From 67bb7d93ba8fccd030bd8d01536f3222c85134b7 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 14 Apr 2013 17:31:42 +1000 Subject: vfs: Add vfs_handle_struct argument to smb_set_nt_acl_nfs4 and the callback This allows the callback to call xattr based storage functions that need this argument. Andrew Bartlett Reviewed-by: Jeremy Allison --- source3/modules/vfs_zfsacl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/modules/vfs_zfsacl.c') diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c index 6934ad6cf9..91e31e9c4e 100644 --- a/source3/modules/vfs_zfsacl.c +++ b/source3/modules/vfs_zfsacl.c @@ -106,7 +106,7 @@ static NTSTATUS zfs_get_nt_acl_common(const char *name, } /* call-back function processing the NT acl -> ZFS acl using NFSv4 conv. */ -static bool zfs_process_smbacl(files_struct *fsp, SMB4ACL_T *smbacl) +static bool zfs_process_smbacl(vfs_handle_struct *handle, files_struct *fsp, SMB4ACL_T *smbacl) { int naces = smb_get_naces(smbacl), i; ace_t *acebuf; @@ -187,8 +187,8 @@ static NTSTATUS zfs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, uint32 security_info_sent, const struct security_descriptor *psd) { - return smb_set_nt_acl_nfs4(fsp, security_info_sent, psd, - zfs_process_smbacl); + return smb_set_nt_acl_nfs4(handle, fsp, security_info_sent, psd, + zfs_process_smbacl); } static NTSTATUS zfsacl_fget_nt_acl(struct vfs_handle_struct *handle, -- cgit