From: Arvin Schnell <aschnell@suse.de>
Date: Fri, 18 Sep 2020 14:33:07 +0000 (+0200)
Subject: - removed workarounds for old btrfs headers
X-Git-Tag: v0.8.14~7^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89e04c588ad2b3036b907e63be54f9152b227db7;p=thirdparty%2Fsnapper.git

- removed workarounds for old btrfs headers
---

diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc
index 071a3da6..69362974 100644
--- a/snapper/Btrfs.cc
+++ b/snapper/Btrfs.cc
@@ -41,12 +41,6 @@
 #include <btrfs/send.h>
 #include <btrfs/send-stream.h>
 #include <btrfs/send-utils.h>
-#ifdef swap
-// temporary workaround, see
-// https://github.com/openSUSE/snapper/issues/459, fixed properly in
-// btrfs-progs 4.19.1
-#undef swap
-#endif
 #include <boost/version.hpp>
 #include <boost/thread.hpp>
 #endif
diff --git a/snapper/BtrfsUtils.cc b/snapper/BtrfsUtils.cc
index 41e21526..c03fb025 100644
--- a/snapper/BtrfsUtils.cc
+++ b/snapper/BtrfsUtils.cc
@@ -34,12 +34,8 @@
 #ifdef HAVE_LIBBTRFS
 #include <btrfs/ioctl.h>
 #include <btrfs/send-utils.h>
-#ifdef swap
-// temporary workaround, see
-// https://github.com/openSUSE/snapper/issues/459, fixed properly in
-// btrfs-progs 4.19.1
-#undef swap
-#endif
+#else
+#include <linux/btrfs.h>
 #endif
 #include <algorithm>
 #include <functional>
@@ -49,60 +45,6 @@
 #include "snapper/BtrfsUtils.h"
 
 
-#ifndef HAVE_LIBBTRFS
-
-#define BTRFS_IOCTL_MAGIC 0x94
-#define BTRFS_PATH_NAME_MAX 4087
-#define BTRFS_SUBVOL_NAME_MAX 4039
-#define BTRFS_SUBVOL_RDONLY (1ULL << 1)
-#define BTRFS_FSID_SIZE 16
-#define BTRFS_UUID_SIZE 16
-
-#define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, struct btrfs_ioctl_vol_args)
-#define BTRFS_IOC_SUBVOL_CREATE _IOW(BTRFS_IOCTL_MAGIC, 14, struct btrfs_ioctl_vol_args)
-#define BTRFS_IOC_SNAP_DESTROY _IOW(BTRFS_IOCTL_MAGIC, 15, struct btrfs_ioctl_vol_args)
-#define BTRFS_IOC_SNAP_CREATE_V2 _IOW(BTRFS_IOCTL_MAGIC, 23, struct btrfs_ioctl_vol_args_v2)
-#define BTRFS_IOC_SYNC _IO(BTRFS_IOCTL_MAGIC, 8)
-#define BTRFS_IOC_FS_INFO _IOR(BTRFS_IOCTL_MAGIC, 31, struct btrfs_ioctl_fs_info_args)
-
-struct btrfs_ioctl_vol_args
-{
-    __s64 fd;
-    char name[BTRFS_PATH_NAME_MAX + 1];
-};
-
-struct btrfs_ioctl_vol_args_v2
-{
-    __s64 fd;
-    __u64 transid;
-    __u64 flags;
-    __u64 unused[4];
-    char name[BTRFS_SUBVOL_NAME_MAX + 1];
-};
-
-struct btrfs_ioctl_fs_info_args
-{
-    __u64 max_id;
-    __u64 num_devices;
-    __u8 fsid[BTRFS_FSID_SIZE];
-    __u32 nodesize;
-    __u32 sectorsize;
-    __u32 clone_alignment;
-    __u32 reserved32;
-    __u64 reserved[122];
-};
-
-#endif
-
-#ifndef BTRFS_IOC_SUBVOL_GETFLAGS
-#define BTRFS_IOC_SUBVOL_GETFLAGS _IOR(BTRFS_IOCTL_MAGIC, 25, __u64)
-#endif
-
-#ifndef BTRFS_QGROUP_LEVEL_SHIFT
-#define BTRFS_QGROUP_LEVEL_SHIFT 48
-#endif
-
-
 namespace snapper
 {
 
@@ -643,7 +585,7 @@ namespace snapper
 	Uuid
 	get_uuid(int fd)
 	{
-	    static_assert(BTRFS_UUID_SIZE == 16);
+	    static_assert(BTRFS_UUID_SIZE == 16, "unexpected value of BTRFS_UUID_SIZE");
 
 	    struct btrfs_ioctl_fs_info_args fs_info_args;
 	    if (ioctl(fd, BTRFS_IOC_FS_INFO, &fs_info_args) < 0)