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

s3: VFS: vfs_catia: 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_catia.c b/source3/modules/vfs_catia.c
index 9cf9e62d7bd..ed79edc23a7 100644
--- a/source3/modules/vfs_catia.c
+++ b/source3/modules/vfs_catia.c
@@ -676,37 +676,6 @@ static int catia_lstat(vfs_handle_struct *handle,
 	return ret;
 }
 
-static int catia_unlink(vfs_handle_struct *handle,
-			const struct smb_filename *smb_fname)
-{
-	struct smb_filename *smb_fname_tmp = NULL;
-	char *name = NULL;
-	NTSTATUS status;
-	int ret;
-
-	status = catia_string_replace_allocate(handle->conn,
-					smb_fname->base_name,
-					&name, vfs_translate_to_unix);
-	if (!NT_STATUS_IS_OK(status)) {
-		errno = map_errno_from_nt_status(status);
-		return -1;
-	}
-
-	/* Setup temporary smb_filename structs. */
-	smb_fname_tmp = cp_smb_filename(talloc_tos(), smb_fname);
-	if (smb_fname_tmp == NULL) {
-		errno = ENOMEM;
-		return -1;
-	}
-
-	smb_fname_tmp->base_name = name;
-	ret = SMB_VFS_NEXT_UNLINK(handle, smb_fname_tmp);
-	TALLOC_FREE(smb_fname_tmp);
-	TALLOC_FREE(name);
-
-	return ret;
-}
-
 static int catia_unlinkat(vfs_handle_struct *handle,
 			struct files_struct *dirfsp,
 			const struct smb_filename *smb_fname,
@@ -2492,7 +2461,6 @@ static struct vfs_fn_pointers vfs_catia_fns = {
 	.stat_fn = catia_stat,
 	.fstat_fn = catia_fstat,
 	.lstat_fn = catia_lstat,
-	.unlink_fn = catia_unlink,
 	.unlinkat_fn = catia_unlinkat,
 	.chmod_fn = catia_chmod,
 	.fchmod_fn = catia_fchmod,