From: Jeremy Allison <jra@samba.org>
Date: Fri, 4 Oct 2019 21:44:48 +0000 (-0700)
Subject: s3: VFS: vfs_ceph_snapshots: Remove rmdir_fn(). No longer used.
X-Git-Tag: talloc-2.3.1~406
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=09d33f5b31f591c18a29be2265a4b536f3348c2b;p=thirdparty%2Fsamba.git

s3: VFS: vfs_ceph_snapshots: 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_ceph_snapshots.c b/source3/modules/vfs_ceph_snapshots.c
index 3fbb765a5fd..680716fcf98 100644
--- a/source3/modules/vfs_ceph_snapshots.c
+++ b/source3/modules/vfs_ceph_snapshots.c
@@ -1340,26 +1340,6 @@ static int ceph_snap_gmt_mkdirat(vfs_handle_struct *handle,
 			mode);
 }
 
-static int ceph_snap_gmt_rmdir(vfs_handle_struct *handle,
-				const struct smb_filename *csmb_fname)
-{
-	time_t timestamp = 0;
-	int ret;
-
-	ret = ceph_snap_gmt_strip_snapshot(handle,
-					csmb_fname->base_name,
-					&timestamp, NULL, 0);
-	if (ret < 0) {
-		errno = -ret;
-		return -1;
-	}
-	if (timestamp != 0) {
-		errno = EROFS;
-		return -1;
-	}
-	return SMB_VFS_NEXT_RMDIR(handle, csmb_fname);
-}
-
 static int ceph_snap_gmt_chflags(vfs_handle_struct *handle,
 				const struct smb_filename *csmb_fname,
 				unsigned int flags)
@@ -1653,7 +1633,6 @@ static struct vfs_fn_pointers ceph_snap_fns = {
 	.fget_nt_acl_fn = ceph_snap_gmt_fget_nt_acl,
 	.get_nt_acl_fn = ceph_snap_gmt_get_nt_acl,
 	.mkdirat_fn = ceph_snap_gmt_mkdirat,
-	.rmdir_fn = ceph_snap_gmt_rmdir,
 	.getxattr_fn = ceph_snap_gmt_getxattr,
 	.getxattrat_send_fn = vfs_not_implemented_getxattrat_send,
 	.getxattrat_recv_fn = vfs_not_implemented_getxattrat_recv,