From: Noel Power <noel.power@suse.com>
Date: Thu, 8 Apr 2021 10:10:54 +0000 (+0100)
Subject: s3/modules: nfs4acl_xattr_fset_nt_acl VFS_SMB_NEXT_CHMOD => VFS_SMB_NEXT_FCHMOD
X-Git-Tag: tevent-0.11.0~1217
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb571d2b47644f0cd4f148d2e52d9970b4d4d6c5;p=thirdparty%2Fsamba.git

s3/modules: nfs4acl_xattr_fset_nt_acl VFS_SMB_NEXT_CHMOD => VFS_SMB_NEXT_FCHMOD

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/modules/vfs_nfs4acl_xattr.c b/source3/modules/vfs_nfs4acl_xattr.c
index 6cd80018c70..e91269cd689 100644
--- a/source3/modules/vfs_nfs4acl_xattr.c
+++ b/source3/modules/vfs_nfs4acl_xattr.c
@@ -421,15 +421,9 @@ static NTSTATUS nfs4acl_xattr_fset_nt_acl(vfs_handle_struct *handle,
 
 		restored_mode = existing_mode | expected_mode;
 
-		if (fsp_get_io_fd(fsp) != -1) {
-			ret = SMB_VFS_NEXT_FCHMOD(handle,
-						  fsp,
-						  restored_mode);
-		} else {
-			ret = SMB_VFS_NEXT_CHMOD(handle,
-						 fsp->fsp_name,
-						 restored_mode);
-		}
+		ret = SMB_VFS_NEXT_FCHMOD(handle,
+					  fsp,
+					  restored_mode);
 		if (ret != 0) {
 			DBG_ERR("Resetting POSIX mode on [%s] from [0%o]: %s\n",
 				fsp_str_dbg(fsp), existing_mode,