- avoid stale btrfs qgroups on transactional systems (bsc#1210151)

diff --git a/package/snapper.changes b/package/snapper.changes
index 859cb8643dcb854c657c643b5cfd28ff43b7af6a..ec442e7216b2502522e8813ba121ac944358d384 100644 (file)
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Apr 13 09:25:42 CEST 2023 - aschnell@suse.com
+
+- avoid stale btrfs qgroups on transactional systems (bsc#1210151)
+
 -------------------------------------------------------------------
 Wed Apr 12 13:32:34 CEST 2023 - aschnell@suse.com
 

diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc
index 80f45d0f51da91d2d70ea2fc4cc9ab3a0b2e90ad..cc01daf098f86745a6e656bd879f48f81fdf69ff 100644 (file)
--- a/snapper/Btrfs.cc
+++ b/snapper/Btrfs.cc
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) [2011-2015] Novell, Inc.
- * Copyright (c) [2016-2020] SUSE LLC
+ * Copyright (c) [2016-2023] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -420,13 +420,13 @@ namespace snapper
 
            try
            {
-               SDir subvolume_dir = openSubvolumeDir();
-               qgroup_destroy(subvolume_dir.fd(), calc_qgroup(0, subvolid));
+               SDir general_dir = openGeneralDir();
+               qgroup_destroy(general_dir.fd(), calc_qgroup(0, subvolid));
            }
            catch (const runtime_error& e)
            {
                // Ignore that the qgroup could not be destroyed. Should not
-               // cause problems except of having unused qgroups.
+               // cause problems except of having stale qgroups.
            }
 
 #endif