From: Jeremy Allison <jra@samba.org>
Date: Wed, 18 Sep 2019 02:15:38 +0000 (-0700)
Subject: s3: VFS: vfs_virusfilter: Remove unlink_fn. No longer used.
X-Git-Tag: talloc-2.3.1~583
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36f4d0f76e6b71a6f79ca0f3cab84b55c40028ec;p=thirdparty%2Fsamba.git

s3: VFS: vfs_virusfilter: 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_virusfilter.c b/source3/modules/vfs_virusfilter.c
index 6b16193339f..828fd166eed 100644
--- a/source3/modules/vfs_virusfilter.c
+++ b/source3/modules/vfs_virusfilter.c
@@ -1432,34 +1432,6 @@ virusfilter_vfs_close_fail:
 	return close_result;
 }
 
-static int virusfilter_vfs_unlink(
-	struct vfs_handle_struct *handle,
-	const struct smb_filename *smb_fname)
-{
-	int ret = SMB_VFS_NEXT_UNLINK(handle, smb_fname);
-	struct virusfilter_config *config = NULL;
-	char *fname = NULL;
-	char *cwd_fname = handle->conn->cwd_fsp->fsp_name->base_name;
-
-	if (ret != 0 && errno != ENOENT) {
-		return ret;
-	}
-
-	SMB_VFS_HANDLE_GET_DATA(handle, config,
-				struct virusfilter_config, return -1);
-
-	if (config->cache == NULL) {
-		return 0;
-	}
-
-	fname = smb_fname->base_name;
-
-	DBG_DEBUG("Removing cache entry (if existent): fname: %s\n", fname);
-	virusfilter_cache_remove(config->cache, cwd_fname, fname);
-
-	return 0;
-}
-
 static int virusfilter_vfs_unlinkat(struct vfs_handle_struct *handle,
 		struct files_struct *dirfsp,
 		const struct smb_filename *smb_fname,
@@ -1539,7 +1511,6 @@ static struct vfs_fn_pointers vfs_virusfilter_fns = {
 	.disconnect_fn	= virusfilter_vfs_disconnect,
 	.open_fn	= virusfilter_vfs_open,
 	.close_fn	= virusfilter_vfs_close,
-	.unlink_fn	= virusfilter_vfs_unlink,
 	.unlinkat_fn	= virusfilter_vfs_unlinkat,
 	.renameat_fn	= virusfilter_vfs_renameat,
 };