From: Arvin Schnell <aschnell@suse.de>
Date: Thu, 13 Apr 2023 07:26:55 +0000 (+0200)
Subject: - avoid stale btrfs qgroups on transactional systems (bsc#1210151)
X-Git-Tag: v0.10.5~23^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d223835744c7cdf4e0607bf0dc915063726cb27;p=thirdparty%2Fsnapper.git

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

diff --git a/package/snapper.changes b/package/snapper.changes
index 859cb864..ec442e72 100644
--- 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 80f45d0f..cc01daf0 100644
--- 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