Merged update to 16.2.9 from master

[packages/ceph.git] / ceph-zfs.patch

diff --git a/ceph-zfs.patch b/ceph-zfs.patch
deleted file mode 100644 (file)
index 35b27b4..0000000
--- a/ceph-zfs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ceph-12.2.13/src/os/fs/ZFS.cc.orig 2020-01-30 21:52:36.000000000 +0100
-+++ ceph-12.2.13/src/os/fs/ZFS.cc      2020-05-31 17:23:41.051356069 +0200
-@@ -79,5 +79,5 @@
- 
- int ZFS::iter_snapshots_sorted(ZFS::Handle *h, ZFS::iter_func f, void *d)
- {
--  return ::zfs_iter_snapshots_sorted((zfs_handle_t*)h, (zfs_iter_f)f, d);
-+  return ::zfs_iter_snapshots_sorted((zfs_handle_t*)h, (zfs_iter_f)f, d, 0, 0);
- }
---- ceph-12.2.13/src/test/filestore/TestFileStore.cc.orig      2020-01-30 21:52:36.000000000 +0100
-+++ ceph-12.2.13/src/test/filestore/TestFileStore.cc   2020-05-31 21:49:43.249209757 +0200
-@@ -56,7 +56,7 @@
- #ifdef HAVE_LIBZFS
-   {
-     map<string,string> pm;
--    FileStore fs("a", "b");
-+    FileStore fs(g_ceph_context, "a", "b");
-     TestFileStore::create_backend(fs, ZFS_SUPER_MAGIC);
-     fs.collect_metadata(&pm);
-     ASSERT_EQ(pm["filestore_backend"], "zfs");