From: Arvin Schnell <aschnell@suse.de>
Date: Thu, 2 Feb 2017 13:51:19 +0000 (+0100)
Subject: - build SLE12 versions with quota support again (bsc#1021370)
X-Git-Tag: v0.5.0~10^2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=refs%2Fpull%2F322%2Fhead;p=thirdparty%2Fsnapper.git

- build SLE12 versions with quota support again (bsc#1021370)
---

diff --git a/VERSION b/VERSION
index 267577d4..2b7c5ae0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.4.1
+0.4.2
diff --git a/package/snapper.changes b/package/snapper.changes
index cdfc3c37..a267afff 100644
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 02 14:49:59 CET 2017 - aschnell@suse.com
+
+- build SLE12 versions with quota support again (bsc#1021370)
+- versions 0.4.2
+
 -------------------------------------------------------------------
 Wed Dec 21 10:29:57 CET 2016 - aschnell@suse.com
 
diff --git a/snapper.spec.in b/snapper.spec.in
index f6d4ff1f..8a9f79bb 100644
--- a/snapper.spec.in
+++ b/snapper.spec.in
@@ -98,7 +98,7 @@ autoconf
 %if 0%{?suse_version} <= 1310
 	--disable-rollback							\
 %endif
-%if 0%{?suse_version} <= 1320
+%if 0%{?suse_version} <= 1310
 	--disable-btrfs-quota							\
 %endif
 	--disable-silent-rules --disable-ext4
diff --git a/snapper/BtrfsUtils.cc b/snapper/BtrfsUtils.cc
index b0f7ca66..c88b5560 100644
--- a/snapper/BtrfsUtils.cc
+++ b/snapper/BtrfsUtils.cc
@@ -77,6 +77,10 @@ struct btrfs_ioctl_vol_args_v2
 #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
 {