From: Jeremy Allison <jra@samba.org>
Date: Sat, 15 May 2021 01:20:54 +0000 (-0700)
Subject: s3: VFS: media_harmony: Remove mh_sys_acl_delete_def_file().
X-Git-Tag: tevent-0.11.0~833
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=46bc4555828b4ae960de3d9b2278653674bf27ad;p=thirdparty%2Fsamba.git

s3: VFS: media_harmony: Remove mh_sys_acl_delete_def_file().

No longer used.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <npower@samba.org>
---

diff --git a/source3/modules/vfs_media_harmony.c b/source3/modules/vfs_media_harmony.c
index a899b3180a1..38b463cf0d4 100644
--- a/source3/modules/vfs_media_harmony.c
+++ b/source3/modules/vfs_media_harmony.c
@@ -1945,37 +1945,6 @@ out:
 	return ret;
 }
 
-/*
- * Success: return 0
- * Failure: set errno, return -1
- */
-static int mh_sys_acl_delete_def_file(vfs_handle_struct *handle,
-			const struct smb_filename *smb_fname)
-{
-	int status;
-	struct smb_filename *clientFname = NULL;
-
-	DEBUG(MH_INFO_DEBUG, ("Entering mh_sys_acl_delete_def_file\n"));
-	if (!is_in_media_files(smb_fname->base_name)) {
-		status = SMB_VFS_NEXT_SYS_ACL_DELETE_DEF_FILE(handle,
-				smb_fname);
-		goto out;
-	}
-
-	status = alloc_get_client_smb_fname(handle,
-				talloc_tos(),
-				smb_fname,
-				&clientFname);
-	if (status != 0) {
-		goto err;
-	}
-	status = SMB_VFS_NEXT_SYS_ACL_DELETE_DEF_FILE(handle, clientFname);
-err:
-	TALLOC_FREE(clientFname);
-out:
-	return status;
-}
-
 /*
  * Success: return positive number
  * Failure: set errno, return -1
@@ -2061,7 +2030,6 @@ static struct vfs_fn_pointers vfs_mh_fns = {
 	/* POSIX ACL operations. */
 
 	.sys_acl_get_file_fn = mh_sys_acl_get_file,
-	.sys_acl_delete_def_file_fn = mh_sys_acl_delete_def_file,
 
 	/* EA operations. */
 	.getxattr_fn = mh_getxattr,