From: Jeremy Allison <jra@samba.org>
Date: Tue, 17 Sep 2019 01:04:06 +0000 (-0700)
Subject: s3: VFS: vfs_media_harmony: Remove unlink_fn. No longer used.
X-Git-Tag: talloc-2.3.1~588
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64854db8ac270acf16fa98f1b6ce26d19885795d;p=thirdparty%2Fsamba.git

s3: VFS: vfs_media_harmony: Remove unlink_fn. No longer used.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/modules/vfs_media_harmony.c b/source3/modules/vfs_media_harmony.c
index 77496ef374f..c64b4cdf557 100644
--- a/source3/modules/vfs_media_harmony.c
+++ b/source3/modules/vfs_media_harmony.c
@@ -1509,41 +1509,6 @@ out:
 	return status;
 }
 
-/*
- * Success: return 0
- * Failure: set errno, return -1
- */
-static int mh_unlink(vfs_handle_struct *handle,
-		const struct smb_filename *smb_fname)
-{
-	int status;
-	struct smb_filename *clientFname;
-	TALLOC_CTX *ctx;
-
-	DEBUG(MH_INFO_DEBUG, ("Entering mh_unlink\n"));
-	if (!is_in_media_files(smb_fname->base_name))
-	{
-		status = SMB_VFS_NEXT_UNLINK(handle, smb_fname);
-		goto out;
-	}
-
-	clientFname = NULL;
-	ctx = talloc_tos();
-
-	if ((status = alloc_get_client_smb_fname(handle, ctx,
-				smb_fname,
-				&clientFname)))
-	{
-		goto err;
-	}
-
-	status = SMB_VFS_NEXT_UNLINK(handle, clientFname);
-err:
-	TALLOC_FREE(clientFname);
-out:
-	return status;
-}
-
 /*
  * Success: return 0
  * Failure: set errno, return -1
@@ -2375,7 +2340,6 @@ static struct vfs_fn_pointers vfs_mh_fns = {
 	.stat_fn = mh_stat,
 	.lstat_fn = mh_lstat,
 	.fstat_fn = mh_fstat,
-	.unlink_fn = mh_unlink,
 	.unlinkat_fn = mh_unlinkat,
 	.chmod_fn = mh_chmod,
 	.chown_fn = mh_chown,