commit bees for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bees for openSUSE:Factory checked in
at 2024-03-08 18:12:22
Comparing /work/SRC/openSUSE:Factory/bees (Old)
and /work/SRC/openSUSE:Factory/.bees.new.1770 (New)
Package is "bees"
Fri Mar 8 18:12:22 2024 rev:10 rq:1156387 version:0.10
Changes:
--- /work/SRC/openSUSE:Factory/bees/bees.changes2023-07-25
11:53:01.754129095 +0200
+++ /work/SRC/openSUSE:Factory/.bees.new.1770/bees.changes 2024-03-08
18:12:23.185211400 +0100
@@ -1,0 +2,6 @@
+Thu Mar 7 15:05:28 UTC 2024 - Max Lin
+
+- Fix build fail with gcc7 on Leap 15
+ * Use gcc13 on compilation
+
+---
Other differences:
--
++ bees.spec ++
--- /var/tmp/diff_new_pack.HXeE63/_old 2024-03-08 18:12:23.729231391 +0100
+++ /var/tmp/diff_new_pack.HXeE63/_new 2024-03-08 18:12:23.729231391 +0100
@@ -28,6 +28,11 @@
BuildRequires: libbtrfs-devel
BuildRequires: libuuid-devel
BuildRequires: make
+%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150200
+BuildRequires: gcc13-c++
+%else
+BuildRequires: gcc-c++
+%endif
%description
bees is a block-oriented userspace deduplication agent designed for large btrfs
@@ -50,6 +55,10 @@
%autosetup -p1
%build
+%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150200
+export CC=gcc-13
+export CXX=g++-13
+%endif
cat >localconf <<-EOF
SYSTEMD_SYSTEM_UNIT_DIR=%{_unitdir}
LIBEXEC_PREFIX=%{_bindir}
commit bees for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bees for openSUSE:Factory checked in
at 2023-07-25 11:51:13
Comparing /work/SRC/openSUSE:Factory/bees (Old)
and /work/SRC/openSUSE:Factory/.bees.new.1467 (New)
Package is "bees"
Tue Jul 25 11:51:13 2023 rev:9 rq:1100400 version:0.10
Changes:
--- /work/SRC/openSUSE:Factory/bees/bees.changes2023-04-04
21:26:37.775307892 +0200
+++ /work/SRC/openSUSE:Factory/.bees.new.1467/bees.changes 2023-07-25
11:53:01.754129095 +0200
@@ -1,0 +2,9 @@
+Mon Jul 24 13:28:10 UTC 2023 - Frederic Crozat
+
+- Update to 0.10:
+ * Update kernel bugs list to 6.4.1
+ * Update docs
+ * Build fixes for GCC 13 and clang 16
+- Drop avoid-swap.patch, no longer needed.
+
+---
Old:
avoid-swap.patch
v0.9.3.tar.gz
New:
v0.10.tar.gz
Other differences:
--
++ bees.spec ++
--- /var/tmp/diff_new_pack.JlDKNK/_old 2023-07-25 11:53:02.594134013 +0200
+++ /var/tmp/diff_new_pack.JlDKNK/_new 2023-07-25 11:53:02.598134037 +0200
@@ -17,14 +17,13 @@
Name: bees
-Version:0.9.3
+Version:0.10
Release:0
Summary:Best-Effort Extent-Same, a btrfs deduplication agent
License:GPL-3.0-only
Group: System/Filesystems
URL:https://github.com/Zygo/bees
Source:
https://github.com/Zygo/bees/archive/refs/tags/v%{version}.tar.gz
-Patch1: avoid-swap.patch
BuildRequires: gcc-c++
BuildRequires: libbtrfs-devel
BuildRequires: libuuid-devel
++ v0.9.3.tar.gz -> v0.10.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/bees-0.9.3/README.md new/bees-0.10/README.md
--- old/bees-0.9.3/README.md2023-02-24 04:45:31.0 +0100
+++ new/bees-0.10/README.md 2023-07-06 19:50:12.0 +0200
@@ -17,7 +17,6 @@
* Space-efficient hash table and matching algorithms - can use as little as 1
GB hash table per 10 TB unique data (0.1GB/TB)
* Daemon incrementally dedupes new data using btrfs tree search
* Works with btrfs compression - dedupe any combination of compressed and
uncompressed files
- * **NEW** [Works around `btrfs send` problems with dedupe and incremental
parent snapshots](docs/options.md)
* Works around btrfs filesystem structure to free more disk space
* Persistent hash table for rapid restart after shutdown
* Whole-filesystem dedupe - including snapshots
@@ -70,6 +69,6 @@
Copyright & License
---
-Copyright 2015-2022 Zygo Blaxell .
+Copyright 2015-2023 Zygo Blaxell .
GPL (version 3 or later).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/bees-0.9.3/docs/btrfs-kernel.md
new/bees-0.10/docs/btrfs-kernel.md
--- old/bees-0.9.3/docs/btrfs-kernel.md 2023-02-24 04:45:31.0 +0100
+++ new/bees-0.10/docs/btrfs-kernel.md 2023-07-06 19:50:12.0 +0200
@@ -7,23 +7,24 @@
severe regression that can lead to fatal metadata corruption.**
This issue is fixed in kernel 5.4.14 and later.
-**Recommended kernel versions for bees are 4.19, 5.4, 5.10, 5.11, or 5.12,
-with recent LTS and -stable updates.** The latest released kernel as
-of this writing is 5.18.18.
-
-4.14, 4.9, and 4.4 LTS kernels with recent updates are OK with
-some issues. Older kernels will be slower (a little slower or a lot
-slower depending on which issues are triggered). Not all fixes are
-backported.
+**Recommended kernel versions for bees are 4.19, 5.4, 5.10, 5.11, 5.15,
+6.0, or 6.1, with recent LTS and -stable updates.** The latest released
+kernel as of this writing is 6.4.1.
+
+4.14, 4.9, and 4.4 LTS kernels with recent updates are OK with some
+issues. Older kernels will be slower (a little slower or a lot slower
+depending on which issues are triggered). Not all fixes are backported.
Obsolete non-LTS kernels have a variety of unfixed issues and should
not be used with btrfs. For details see the table below.
bees requires btrfs kernel API version 4.2 or higher, and does not work
-on older kernels.
+at all on older kernels.
-bees will detect and use btrfs kernel API up to version 4.15 if present.
-In some future bees release, this API version may become mandatory.
+Some bees features rely on kernel 4.15 to work, and these features will
+not be available on older kernels. Currently, bees is still usable on
+older kernels with degraded performance or with options disabled, but
+support for older kernels may be removed.
@@ -58,14 +59,17 @@
| - | 5.8 | deadlock in `TREE_SEARCH` ioctl (core component of bees filesystem
scanner), followed by regression in deadlock fix | 4.4.237, 4
commit bees for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bees for openSUSE:Factory checked in
at 2023-04-04 21:26:21
Comparing /work/SRC/openSUSE:Factory/bees (Old)
and /work/SRC/openSUSE:Factory/.bees.new.19717 (New)
Package is "bees"
Tue Apr 4 21:26:21 2023 rev:8 rq:1077138 version:0.9.3
Changes:
--- /work/SRC/openSUSE:Factory/bees/bees.changes2023-03-15
18:54:44.076455818 +0100
+++ /work/SRC/openSUSE:Factory/.bees.new.19717/bees.changes 2023-04-04
21:26:37.775307892 +0200
@@ -1,0 +2,11 @@
+Tue Apr 4 06:59:34 UTC 2023 - Dirk Müller
+
+- update to 0.9.3:
+ * roots: don't share a RootFetcher between threads
+ * seeker: fix the test for ILP32 platforms
+ * reduce memory usage with long-running work items
+ * allow BtrfsIoctlLogicalInoArgs to be reused, remove virtual methods
+ * create a Pool of BtrfsIoctlLogicalInoArgs objects
+- add avoid-swap.patch to fix build with gcc 13
+
+---
Old:
v0.9.1.tar.gz
New:
avoid-swap.patch
v0.9.3.tar.gz
Other differences:
--
++ bees.spec ++
--- /var/tmp/diff_new_pack.KoLkCF/_old 2023-04-04 21:26:38.295310844 +0200
+++ /var/tmp/diff_new_pack.KoLkCF/_new 2023-04-04 21:26:38.303310889 +0200
@@ -17,13 +17,14 @@
Name: bees
-Version:0.9.1
+Version:0.9.3
Release:0
Summary:Best-Effort Extent-Same, a btrfs deduplication agent
License:GPL-3.0-only
Group: System/Filesystems
URL:https://github.com/Zygo/bees
Source:
https://github.com/Zygo/bees/archive/refs/tags/v%{version}.tar.gz
+Patch1: avoid-swap.patch
BuildRequires: gcc-c++
BuildRequires: libbtrfs-devel
BuildRequires: libuuid-devel
@@ -47,7 +48,7 @@
* Automatic self-throttling based on system load
%prep
-%setup -q
+%autosetup -p1
%build
cat >localconf <<-EOF
++ avoid-swap.patch ++
--- bees-0.9.3/include/crucible/cache.h
+++ bees-0.9.3/include/crucible/cache.h
@@ -181,14 +181,8 @@ namespace crucible {
void
LRUCache::clear()
{
- // Move the map and list onto the stack, then destroy it after
we've released the lock
- // so that we don't block other threads if the list's
destructors are expensive
- decltype(m_list) new_list;
- decltype(m_map) new_map;
- unique_lock lock(m_mutex);
- m_list.swap(new_list);
- m_map.swap(new_map);
- lock.unlock();
+ m_list.clear();
+ m_map.clear();
}
template
++ v0.9.1.tar.gz -> v0.9.3.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/bees-0.9.1/include/crucible/fs.h
new/bees-0.9.3/include/crucible/fs.h
--- old/bees-0.9.1/include/crucible/fs.h2023-01-28 11:21:51.0
+0100
+++ new/bees-0.9.3/include/crucible/fs.h2023-02-24 04:45:31.0
+0100
@@ -69,9 +69,11 @@
uint64_t get_flags() const;
void set_flags(uint64_t new_flags);
+ void set_logical(uint64_t new_logical);
+ void set_size(uint64_t new_size);
- virtual void do_ioctl(int fd);
- virtual bool do_ioctl_nothrow(int fd);
+ void do_ioctl(int fd);
+ bool do_ioctl_nothrow(int fd);
struct BtrfsInodeOffsetRootSpan {
using iterator = BtrfsInodeOffsetRoot*;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/bees-0.9.1/include/crucible/progress.h
new/bees-0.9.3/include/crucible/progress.h
--- old/bees-0.9.1/include/crucible/progress.h 2023-01-28 11:21:51.0
+0100
+++ new/bees-0.9.3/include/crucible/progress.h 2023-02-24 04:45:31.0
+0100
@@ -4,13 +4,20 @@
#include "crucible/error.h"
#include
-#include
#include
#include
+#include
+
+#include
namespace crucible {
using namespace std;
+ /// A class to track progress of multiple workers using only two points:
+ /// the first and last incomplete state. The first incomplete
+ /// state can be recorded as a checkpoint to resume later on.
+ /// The last completed state is the starting point for workers that
+ /// need something to do.
template
class ProgressTracker {
struct ProgressTrackerState;
@@ -19,8 +26,16 @@
using value_type = T;
using ProgressHolder = shared_ptr;
+ /// Create ProgressTracker with initial begin and end state 'v'.
ProgressTracker(c
commit bees for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bees for openSUSE:Factory checked in
at 2023-03-15 18:54:27
Comparing /work/SRC/openSUSE:Factory/bees (Old)
and /work/SRC/openSUSE:Factory/.bees.new.31432 (New)
Package is "bees"
Wed Mar 15 18:54:27 2023 rev:7 rq:1071831 version:0.9.1
Changes:
--- /work/SRC/openSUSE:Factory/bees/bees.changes2023-02-15
13:40:23.370737049 +0100
+++ /work/SRC/openSUSE:Factory/.bees.new.31432/bees.changes 2023-03-15
18:54:44.076455818 +0100
@@ -1,0 +2,5 @@
+Sun Mar 12 23:52:54 UTC 2023 - Björn Bidar
+
+- Removed patch: fix-Makefile-version.diff, replaced with make parameter.
+
+---
Old:
fix-Makefile-version.diff
Other differences:
--
++ bees.spec ++
--- /var/tmp/diff_new_pack.klC26J/_old 2023-03-15 18:54:44.612458669 +0100
+++ /var/tmp/diff_new_pack.klC26J/_new 2023-03-15 18:54:44.620458712 +0100
@@ -24,7 +24,6 @@
Group: System/Filesystems
URL:https://github.com/Zygo/bees
Source:
https://github.com/Zygo/bees/archive/refs/tags/v%{version}.tar.gz
-Patch1: fix-Makefile-version.diff
BuildRequires: gcc-c++
BuildRequires: libbtrfs-devel
BuildRequires: libuuid-devel
@@ -49,7 +48,6 @@
%prep
%setup -q
-%patch1 -p1
%build
cat >localconf <<-EOF
@@ -61,7 +59,7 @@
DEFAULT_MAKE_TARGET=all
EOF
-%make_build
+%make_build BEES_VERSION=%{version}
%install
%make_install
commit bees for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package bees for openSUSE:Factory checked in at 2023-02-15 13:40:11 Comparing /work/SRC/openSUSE:Factory/bees (Old) and /work/SRC/openSUSE:Factory/.bees.new.22824 (New) Package is "bees" Wed Feb 15 13:40:11 2023 rev:6 rq:1065809 version:0.9.1 Changes: --- /work/SRC/openSUSE:Factory/bees/bees.changes2022-12-05 18:02:33.237023583 +0100 +++ /work/SRC/openSUSE:Factory/.bees.new.22824/bees.changes 2023-02-15 13:40:23.370737049 +0100 @@ -1,0 +2,25 @@ +Tue Feb 14 07:27:50 UTC 2023 - Avinesh Kumar + +- update to 0.9.1: + * Fix the install target. + * Makefile: also drop fiemap and fiewalk from main Makefile + +- update to 0.9: + - Highlights: +* Work around a kernel bug which can be triggered by running the + LOGICAL_INO ioctl and dedupe on the same extent at the same time. +* Prevent worker threads from being blocked by extent and inode + locks. Defer the blocked item and find something else for that + worker thread to do. +* Fix the labelling of threads so they aren't all "task_consumer". +* Speed up SIGTERM process termination to have a better chance of + flushing the hash table and crawl state to $BEESHOME before the + process is killed by a service timeout. +* Reduce the hash table writeback rate to 128K/s. +* Reduce the interval between crawl restarts to one transid. +* Add 'recent' scan mode, which dedupes new data in fully scanned + subvols instead of waiting for every old subvol to be scanned. +* Better behavior when there are write errors in $BEESHOME. +* Drop the unused and obsolete `fiemap` and `fiewalk` binaries. + +--- Old: v0.8.tar.gz New: v0.9.1.tar.gz Other differences: -- ++ bees.spec ++ --- /var/tmp/diff_new_pack.nSH7F9/_old 2023-02-15 13:40:24.246741669 +0100 +++ /var/tmp/diff_new_pack.nSH7F9/_new 2023-02-15 13:40:24.254741711 +0100 @@ -1,7 +1,7 @@ # # spec file for package bees # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: bees -Version:0.8 +Version:0.9.1 Release:0 Summary:Best-Effort Extent-Same, a btrfs deduplication agent License:GPL-3.0-only ++ v0.8.tar.gz -> v0.9.1.tar.gz ++ 5896 lines of diff (skipped)
commit bees for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bees for openSUSE:Factory checked in
at 2022-12-05 18:02:13
Comparing /work/SRC/openSUSE:Factory/bees (Old)
and /work/SRC/openSUSE:Factory/.bees.new.1835 (New)
Package is "bees"
Mon Dec 5 18:02:13 2022 rev:5 rq:1040264 version:0.8
Changes:
--- /work/SRC/openSUSE:Factory/bees/bees.changes2022-10-26
16:08:40.586028173 +0200
+++ /work/SRC/openSUSE:Factory/.bees.new.1835/bees.changes 2022-12-05
18:02:33.237023583 +0100
@@ -1,0 +2,6 @@
+Mon Dec 5 12:42:19 UTC 2022 - Dirk Müller
+
+- update to 0.8:
+ * fs: make dedupe work again after a really unfortunate build fix
+
+---
Old:
bees-0.7-20221025-git.tar.xz
New:
v0.8.tar.gz
Other differences:
--
++ bees.spec ++
--- /var/tmp/diff_new_pack.j6ilsa/_old 2022-12-05 18:02:33.725026241 +0100
+++ /var/tmp/diff_new_pack.j6ilsa/_new 2022-12-05 18:02:33.729026263 +0100
@@ -16,17 +16,14 @@
#
-%define vtag 0.7-20221025
-
Name: bees
-Version:0.7.20221025
+Version:0.8
Release:0
Summary:Best-Effort Extent-Same, a btrfs deduplication agent
License:GPL-3.0-only
Group: System/Filesystems
URL:https://github.com/Zygo/bees
-#Source:
https://github.com/Zygo/bees/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Source: bees-%{vtag}-git.tar.xz
+Source:
https://github.com/Zygo/bees/archive/refs/tags/v%{version}.tar.gz
Patch1: fix-Makefile-version.diff
BuildRequires: gcc-c++
BuildRequires: libbtrfs-devel
@@ -51,7 +48,7 @@
* Automatic self-throttling based on system load
%prep
-%setup -q -n %{name}-%{vtag}
+%setup -q
%patch1 -p1
%build
@@ -64,7 +61,7 @@
DEFAULT_MAKE_TARGET=all
EOF
-make %{?_smp_mflags}
+%make_build
%install
%make_install
commit bees for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bees for openSUSE:Factory checked in
at 2022-10-26 16:08:39
Comparing /work/SRC/openSUSE:Factory/bees (Old)
and /work/SRC/openSUSE:Factory/.bees.new.2275 (New)
Package is "bees"
Wed Oct 26 16:08:39 2022 rev:4 rq:1031346 version:0.7.20221025
Changes:
--- /work/SRC/openSUSE:Factory/bees/bees.changes2022-09-05
21:22:21.649189936 +0200
+++ /work/SRC/openSUSE:Factory/.bees.new.2275/bees.changes 2022-10-26
16:08:40.586028173 +0200
@@ -1,0 +2,7 @@
+Thu Oct 20 00:00:00 CEST 2022 - dste...@suse.cz
+
+- update to 0.7 git 5953ea6d3c5646 (20221025)
+- build fixes
+- Removed patch: 0001-fs-fix-FIEMAP_MAX_OFFSET-type-silliness-in-fiemap.h.patch
+
+---
Old:
0001-fs-fix-FIEMAP_MAX_OFFSET-type-silliness-in-fiemap.h.patch
bees-0.7.tar.gz
New:
bees-0.7-20221025-git.tar.xz
Other differences:
--
++ bees.spec ++
--- /var/tmp/diff_new_pack.RgipCV/_old 2022-10-26 16:08:41.314029135 +0200
+++ /var/tmp/diff_new_pack.RgipCV/_new 2022-10-26 16:08:41.322029146 +0200
@@ -16,16 +16,18 @@
#
+%define vtag 0.7-20221025
+
Name: bees
-Version:0.7
+Version:0.7.20221025
Release:0
Summary:Best-Effort Extent-Same, a btrfs deduplication agent
License:GPL-3.0-only
Group: System/Filesystems
URL:https://github.com/Zygo/bees
-Source:
https://github.com/Zygo/bees/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+#Source:
https://github.com/Zygo/bees/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source: bees-%{vtag}-git.tar.xz
Patch1: fix-Makefile-version.diff
-Patch2: 0001-fs-fix-FIEMAP_MAX_OFFSET-type-silliness-in-fiemap.h.patch
BuildRequires: gcc-c++
BuildRequires: libbtrfs-devel
BuildRequires: libuuid-devel
@@ -49,9 +51,8 @@
* Automatic self-throttling based on system load
%prep
-%setup -q
+%setup -q -n %{name}-%{vtag}
%patch1 -p1
-%patch2 -p1
%build
cat >localconf <<-EOF
commit bees for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bees for openSUSE:Factory checked in
at 2022-09-05 21:22:15
Comparing /work/SRC/openSUSE:Factory/bees (Old)
and /work/SRC/openSUSE:Factory/.bees.new.2083 (New)
Package is "bees"
Mon Sep 5 21:22:15 2022 rev:3 rq:1001259 version:0.7
Changes:
--- /work/SRC/openSUSE:Factory/bees/bees.changes2021-10-06
19:50:19.852070317 +0200
+++ /work/SRC/openSUSE:Factory/.bees.new.2083/bees.changes 2022-09-05
21:22:21.649189936 +0200
@@ -1,0 +2,6 @@
+Mon Sep 5 00:00:00 CEST 2022 - dste...@suse.cz
+
+- Added patch: 0001-fs-fix-FIEMAP_MAX_OFFSET-type-silliness-in-fiemap.h.patch
+ (fix build on ppc64le)
+
+---
New:
0001-fs-fix-FIEMAP_MAX_OFFSET-type-silliness-in-fiemap.h.patch
Other differences:
--
++ bees.spec ++
--- /var/tmp/diff_new_pack.TVSNVA/_old 2022-09-05 21:22:22.141191235 +0200
+++ /var/tmp/diff_new_pack.TVSNVA/_new 2022-09-05 21:22:22.145191245 +0200
@@ -1,7 +1,7 @@
#
# spec file for package bees
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,6 +25,7 @@
URL:https://github.com/Zygo/bees
Source:
https://github.com/Zygo/bees/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch1: fix-Makefile-version.diff
+Patch2: 0001-fs-fix-FIEMAP_MAX_OFFSET-type-silliness-in-fiemap.h.patch
BuildRequires: gcc-c++
BuildRequires: libbtrfs-devel
BuildRequires: libuuid-devel
@@ -50,6 +51,7 @@
%prep
%setup -q
%patch1 -p1
+%patch2 -p1
%build
cat >localconf <<-EOF
++ 0001-fs-fix-FIEMAP_MAX_OFFSET-type-silliness-in-fiemap.h.patch ++
>From 12e80658a8cfb5dc1d8676e3696681ad32fab552 Mon Sep 17 00:00:00 2001
From: Zygo Blaxell
Date: Wed, 6 Oct 2021 15:05:28 -0400
Subject: [PATCH] fs: fix FIEMAP_MAX_OFFSET type silliness in fiemap.h
In fiemap.h the members of struct fiemap are declared as __u64, but the
FIEMAP_MAX_OFFSET macro is an unsigned long long value:
$ grep FIEMAP_MAX_OFFSET -r /usr/include/
/usr/include/linux/fiemap.h:#define FIEMAP_MAX_OFFSET (~0ULL)
$ grep fe_length -r /usr/include/
/usr/include/linux/fiemap.h:__u64 fe_length; /* length in bytes
for this extent */
This results in a type mismatch error on architectures like ppc64le:
fiemap.cc:31:35: note: deduced conflicting types for parameter 'const
_Tp' ('long unsigned int' and 'long long unsigned int')
31 | fm.fm_length = min(fm.fm_length,
FIEMAP_MAX_OFFSET - fm.fm_start);
|
~~~^~~
Work around this by copying the macro into a uint64_t constant,
and not using the macro any more.
Fixes: https://github.com/Zygo/bees/issues/194
Signed-off-by: Zygo Blaxell
---
include/crucible/fs.h | 6 +-
src/fiemap.cc | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/include/crucible/fs.h b/include/crucible/fs.h
index fcd61e055197..dae574015f8c 100644
--- a/include/crucible/fs.h
+++ b/include/crucible/fs.h
@@ -143,8 +143,12 @@ namespace crucible {
struct Fiemap : public fiemap {
+ // because fiemap.h insists on giving FIEMAP_MAX_OFFSET
+ // a different type from the struct fiemap members
+ static const uint64_t s_fiemap_max_offset = FIEMAP_MAX_OFFSET;
+
// Get entire file
- Fiemap(uint64_t start = 0, uint64_t length = FIEMAP_MAX_OFFSET);
+ Fiemap(uint64_t start = 0, uint64_t length =
s_fiemap_max_offset);
void do_ioctl(int fd);
diff --git a/src/fiemap.cc b/src/fiemap.cc
index 1618d3b04308..fb6085ac9738 100644
--- a/src/fiemap.cc
+++ b/src/fiemap.cc
@@ -28,13 +28,13 @@ main(int argc, char **argv)
if (argc > 2) { fm.fm_start = stoull(argv[2], nullptr, 0); }
if (argc > 3) { fm.fm_length = stoull(argv[3], nullptr, 0); }
if (argc > 4) { fm.fm_flags = stoull(argv[4], nullptr, 0); }
- fm.fm_length = min(fm.fm_length, FIEMAP_MAX_OFFSET -
fm.fm_start);
+ fm.fm_length = min(fm.fm_length, Fiemap::s_fiemap_max_offset -
fm.fm_start);
uint64_t stop_at = fm.fm_start + fm.fm_length;
uint64_t last_byte = fm.fm_start;
do {
fm.do_ioctl(fd);
// cerr << fm;
- uint64_t last_logical = FIEMAP_MAX_OFFSET;
+
commit bees for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bees for openSUSE:Factory checked in
at 2021-10-06 19:50:04
Comparing /work/SRC/openSUSE:Factory/bees (Old)
and /work/SRC/openSUSE:Factory/.bees.new.2443 (New)
Package is "bees"
Wed Oct 6 19:50:04 2021 rev:2 rq:923550 version:0.7
Changes:
--- /work/SRC/openSUSE:Factory/bees/bees.changes2021-06-04
22:43:22.947117298 +0200
+++ /work/SRC/openSUSE:Factory/.bees.new.2443/bees.changes 2021-10-06
19:50:19.852070317 +0200
@@ -1,0 +2,20 @@
+Wed Oct 6 00:00:00 CEST 2021 - dste...@suse.cz
+
+- Update to 0.7
+ - Highlights:
+* Remove 8-CPU thread limit
+* Add kernel bugs reference table to docs
+* Workarounds for btrfs send and balance issues
+* Reduce the number of temporary inodes created
+* Use posix_fadvise to optimize page cache usage
+* Use private namespace for mounts under systemd
+* Assorted bug fixes and small performance improvements
+* SIGTERM handler to save crawl state, hash table, and exit
+* Higher ref limits per extent on kernels with LOGICAL_INO_V2
+ - Build dependency changes:
+* Convert docs to Github Flavored Markdown
+* Updates for new compilers including clang
+* Remove dependencies on libbtrfs-dev and uuid-dev
+* Remove unversioned `libcrucible.so` shared library
+
+---
Old:
bees-0.6.5.tar.gz
New:
bees-0.7.tar.gz
Other differences:
--
++ bees.spec ++
--- /var/tmp/diff_new_pack.HqjEOO/_old 2021-10-06 19:50:20.432070855 +0200
+++ /var/tmp/diff_new_pack.HqjEOO/_new 2021-10-06 19:50:20.432070855 +0200
@@ -17,7 +17,7 @@
Name: bees
-Version:0.6.5
+Version:0.7
Release:0
Summary:Best-Effort Extent-Same, a btrfs deduplication agent
License:GPL-3.0-only
@@ -71,7 +71,6 @@
%doc README.md
%{_bindir}/bees
%{_sbindir}/beesd
-%{_libdir}/libcrucible.so
%{_unitdir}/beesd@.service
%dir %{_sysconfdir}/bees
%{_sysconfdir}/bees/beesd.conf.sample
++ bees-0.6.5.tar.gz -> bees-0.7.tar.gz ++
10262 lines of diff (skipped)
++ fix-Makefile-version.diff ++
--- /var/tmp/diff_new_pack.HqjEOO/_old 2021-10-06 19:50:20.536070951 +0200
+++ /var/tmp/diff_new_pack.HqjEOO/_new 2021-10-06 19:50:20.536070951 +0200
@@ -1,25 +1,15 @@
Hardcode version to avoid using git. Also don't do 'git clean'.
-Index: bees-0.6.3/Makefile
+Index: bees-0.7/Makefile
===
bees-0.6.3.orig/Makefile
-+++ bees-0.6.3/Makefile
-@@ -9,7 +9,7 @@ SYSTEMD_SYSTEM_UNIT_DIR ?= $(shell pkg-c
+--- bees-0.7.orig/Makefile
bees-0.7/Makefile
+@@ -7,7 +7,7 @@ LIBEXEC_PREFIX ?= $(LIB_PREFIX)/bees
- MARKDOWN := $(firstword $(shell type -P markdown markdown2 markdown_py
2>/dev/null || echo markdown))
+ SYSTEMD_SYSTEM_UNIT_DIR ?= $(shell pkg-config systemd
--variable=systemdsystemunitdir)
-BEES_VERSION ?= $(shell git describe --always --dirty || echo UNKNOWN)
-+BEES_VERSION = 0.6.5
++BEES_VERSION = 0.7
# allow local configuration to override above variables
-include localconf
-@@ -28,9 +28,6 @@ all: lib src scripts
- docs: README.html
- reallyall: all docs test
-
--clean: ## Cleanup
-- git clean -dfx -e localconf
--
- .PHONY: lib src test
-
- lib: ## Build libs
