From 3febd5aa52c4ce44b5d9877ebbd406ae897b9bae Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 7 Apr 2025 13:44:13 +0100
Subject: [PATCH] Turn flush into a controlpath message resolves: RHEL-85515

---
 ...urn-flush-into-a-controlpath-message.patch | 33 +++++++++++++++++++
 nbdkit.spec                                   |  5 +--
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 0008-server-Turn-flush-into-a-controlpath-message.patch

diff --git a/0008-server-Turn-flush-into-a-controlpath-message.patch b/0008-server-Turn-flush-into-a-controlpath-message.patch
new file mode 100644
index 0000000..ab390bd
--- /dev/null
+++ b/0008-server-Turn-flush-into-a-controlpath-message.patch
@@ -0,0 +1,33 @@
+From 68b8aed947fdb5708963972417ec6bb48ae63d9a Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Sat, 5 Apr 2025 09:02:03 +0100
+Subject: [PATCH] server: Turn flush into a controlpath message
+
+The server debug flags -D nbdkit.backend.controlpath=<bool> and
+-D nbdkit.backend.datapath=<bool> control the verbosity of messages.
+
+'flush' was categorized as a datapath message, but it's more arguably
+a controlpath message, and anyway it is rare and useful to see in
+virt-v2v output even when datapath messages are suppressed.
+
+(cherry picked from commit 079c8a91bf5161614916470dcb1f52bee8bfb397)
+---
+ server/backend.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/server/backend.c b/server/backend.c
+index 6232b69d..1f1bcfce 100644
+--- a/server/backend.c
++++ b/server/backend.c
+@@ -693,7 +693,7 @@ backend_flush (struct context *c,
+   assert (c->handle && (c->state & HANDLE_CONNECTED));
+   assert (c->can_flush == 1);
+   assert (flags == 0);
+-  datapath_debug ("%s: flush", b->name);
++  controlpath_debug ("%s: flush", b->name);
+ 
+   r = b->flush (c, flags, err);
+   if (r == -1)
+-- 
+2.47.1
+
diff --git a/nbdkit.spec b/nbdkit.spec
index e8f1803..cc724ce 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -55,7 +55,7 @@
 
 Name:           nbdkit
 Version:        1.42.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NBD server
 
 License:        BSD-3-Clause
@@ -87,6 +87,7 @@ Patch0004:     0004-tests-Add-more-generic-tests-of-file-cache-none.patch
 Patch0005:     0005-file-Hard-error-if-sync_file_range-fails.patch
 Patch0006:     0006-file-Reduce-the-size-of-the-lock-around-write-evicti.patch
 Patch0007:     0007-file-Document-implicit-assumption-about-eviction-win.patch
+Patch0008:     0008-server-Turn-flush-into-a-controlpath-message.patch
 
 # For automatic RPM Provides generation.
 # See: https://rpm-software-management.github.io/rpm/manual/dependency_generators.html
@@ -1529,7 +1530,7 @@ fi
 
 
 %changelog
-* Tue Apr 01 2025 Richard W.M. Jones <rjones@redhat.com> - 1.42.2-2
+* Mon Apr 07 2025 Richard W.M. Jones <rjones@redhat.com> - 1.42.2-3
 - Rebase to nbdkit 1.42.2
 - Synch the spec file with Fedora Rawhide.
 - nbdkit-ondemand-plugin moves into a new subpackage.