]>
Commit | Line | Data |
---|---|---|
101b8bdd JB |
1 | --- ceph-12.2.13/src/os/fs/ZFS.cc.orig 2020-01-30 21:52:36.000000000 +0100 |
2 | +++ ceph-12.2.13/src/os/fs/ZFS.cc 2020-05-31 17:23:41.051356069 +0200 | |
3 | @@ -79,5 +79,5 @@ | |
4 | ||
5 | int ZFS::iter_snapshots_sorted(ZFS::Handle *h, ZFS::iter_func f, void *d) | |
6 | { | |
7 | - return ::zfs_iter_snapshots_sorted((zfs_handle_t*)h, (zfs_iter_f)f, d); | |
8 | + return ::zfs_iter_snapshots_sorted((zfs_handle_t*)h, (zfs_iter_f)f, d, 0, 0); | |
9 | } | |
acdfce6f JB |
10 | --- ceph-12.2.13/src/test/filestore/TestFileStore.cc.orig 2020-01-30 21:52:36.000000000 +0100 |
11 | +++ ceph-12.2.13/src/test/filestore/TestFileStore.cc 2020-05-31 21:49:43.249209757 +0200 | |
12 | @@ -56,7 +56,7 @@ | |
13 | #ifdef HAVE_LIBZFS | |
14 | { | |
15 | map<string,string> pm; | |
16 | - FileStore fs("a", "b"); | |
17 | + FileStore fs(g_ceph_context, "a", "b"); | |
18 | TestFileStore::create_backend(fs, ZFS_SUPER_MAGIC); | |
19 | fs.collect_metadata(&pm); | |
20 | ASSERT_EQ(pm["filestore_backend"], "zfs"); |