From: Jeremy Allison <jra@samba.org>
Date: Fri, 4 Oct 2019 22:10:58 +0000 (-0700)
Subject: s3: VFS: vfs_snapper: Remove rmdir_fn(). No longer used.
X-Git-Tag: talloc-2.3.1~400
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a940c4c5ac180acf15d005fb3d4fa4a0b3e9b448;p=thirdparty%2Fsamba.git

s3: VFS: vfs_snapper: Remove rmdir_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_snapper.c b/source3/modules/vfs_snapper.c
index d95de5d0a25..db7ab9f7de9 100644
--- a/source3/modules/vfs_snapper.c
+++ b/source3/modules/vfs_snapper.c
@@ -2571,22 +2571,6 @@ static int snapper_gmt_mkdirat(vfs_handle_struct *handle,
 			mode);
 }
 
-static int snapper_gmt_rmdir(vfs_handle_struct *handle,
-				const struct smb_filename *fname)
-{
-	time_t timestamp = 0;
-
-	if (!snapper_gmt_strip_snapshot(talloc_tos(), handle, fname->base_name,
-					&timestamp, NULL)) {
-		return -1;
-	}
-	if (timestamp != 0) {
-		errno = EROFS;
-		return -1;
-	}
-	return SMB_VFS_NEXT_RMDIR(handle, fname);
-}
-
 static int snapper_gmt_chflags(vfs_handle_struct *handle,
 				const struct smb_filename *smb_fname,
 				unsigned int flags)
@@ -2912,7 +2896,6 @@ static struct vfs_fn_pointers snapper_fns = {
 	.get_nt_acl_fn = snapper_gmt_get_nt_acl,
 	.fget_nt_acl_fn = snapper_gmt_fget_nt_acl,
 	.mkdirat_fn = snapper_gmt_mkdirat,
-	.rmdir_fn = snapper_gmt_rmdir,
 	.getxattr_fn = snapper_gmt_getxattr,
 	.getxattrat_send_fn = vfs_not_implemented_getxattrat_send,
 	.getxattrat_recv_fn = vfs_not_implemented_getxattrat_recv,