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

s3: VFS: vfs_ceph_snapshots: 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_ceph_snapshots.c b/source3/modules/vfs_ceph_snapshots.c
index 60a1db07dd6..3fbb765a5fd 100644
--- a/source3/modules/vfs_ceph_snapshots.c
+++ b/source3/modules/vfs_ceph_snapshots.c
@@ -972,26 +972,6 @@ static int ceph_snap_gmt_open(vfs_handle_struct *handle,
 	return ret;
 }
 
-static int ceph_snap_gmt_unlink(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_UNLINK(handle, csmb_fname);
-}
-
 static int ceph_snap_gmt_unlinkat(vfs_handle_struct *handle,
 			struct files_struct *dirfsp,
 			const struct smb_filename *csmb_fname,
@@ -1661,7 +1641,6 @@ static struct vfs_fn_pointers ceph_snap_fns = {
 	.stat_fn = ceph_snap_gmt_stat,
 	.lstat_fn = ceph_snap_gmt_lstat,
 	.open_fn = ceph_snap_gmt_open,
-	.unlink_fn = ceph_snap_gmt_unlink,
 	.unlinkat_fn = ceph_snap_gmt_unlinkat,
 	.chmod_fn = ceph_snap_gmt_chmod,
 	.chown_fn = ceph_snap_gmt_chown,