From: Arvin Schnell <aschnell@suse.de>
Date: Mon, 6 Feb 2023 09:44:53 +0000 (+0100)
Subject: - fix use of does_subvolume_exist()
X-Git-Tag: v0.10.5~57^2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=b7fec87d5e504abc9b0dccb8ca5853b6c8bcd7ca;p=thirdparty%2Fsnapper.git

- fix use of does_subvolume_exist()
---

diff --git a/LIBVERSION b/LIBVERSION
index 6abaeb2f..024b066c 100644
--- a/LIBVERSION
+++ b/LIBVERSION
@@ -1 +1 @@
-6.2.0
+6.2.1
diff --git a/package/snapper.changes b/package/snapper.changes
index f8abf68a..de5b8134 100644
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb 06 10:43:33 CET 2023 - aschnell@suse.com
+
+- fix use of does_subvolume_exist() (bsc#1207901)
+
 -------------------------------------------------------------------
 Wed Jan 25 12:25:23 CET 2023 - aschnell@suse.com
 
diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc
index d7af15ae..80f45d0f 100644
--- a/snapper/Btrfs.cc
+++ b/snapper/Btrfs.cc
@@ -1577,7 +1577,7 @@ namespace snapper
 #ifdef HAVE_LIBBTRFS
 	    for (subvolid_t subvolid : deleted_subvolids)
 	    {
-		while (!does_subvolume_exist(subvolume_dir.fd(), subvolid))
+		while (does_subvolume_exist(subvolume_dir.fd(), subvolid))
 		    sleep(1);
 	    }
 #endif
diff --git a/snapper/BtrfsUtils.cc b/snapper/BtrfsUtils.cc
index 6d693533..53bcb92a 100644
--- a/snapper/BtrfsUtils.cc
+++ b/snapper/BtrfsUtils.cc
@@ -387,7 +387,7 @@ namespace snapper
 	    if (ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args) < 0)
 		throw runtime_error_with_errno("ioctl(BTRFS_IOC_TREE_SEARCH) failed", errno);
 
-	    return sk->nr_items == 0;
+	    return sk->nr_items > 0;
 #endif
 	}
 
diff --git a/testsuite-real/test-btrfsutils.cc b/testsuite-real/test-btrfsutils.cc
index 94ddae80..1134e0c5 100644
--- a/testsuite-real/test-btrfsutils.cc
+++ b/testsuite-real/test-btrfsutils.cc
@@ -35,6 +35,12 @@ main()
     }
 
 
+    if (false)
+    {
+	cout << does_subvolume_exist(fd, 280) << '\n';
+    }
+
+
     if (false)
     {
 	quota_enable(fd);