From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Tue, 22 Apr 2025 10:03:33 +0000 (-0400)
Subject: bcachefs: print_string_as_lines: avoid printing empty line
X-Git-Tag: v6.16-rc1~211^2~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbc18c97f1f0d336e3c4f6bb50f34c5255216995;p=thirdparty%2Fkernel%2Flinux.git

bcachefs: print_string_as_lines: avoid printing empty line

If the final line in in the message to be printed is blang, don't print
it.

This happens with indented printbufs - after a newline we emit spaces up
to the indent level.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/util.c b/fs/bcachefs/util.c
index 7e6ebe8cd9ea3..1cff407c8c9dc 100644
--- a/fs/bcachefs/util.c
+++ b/fs/bcachefs/util.c
@@ -252,6 +252,16 @@ void bch2_prt_u64_base2(struct printbuf *out, u64 v)
 	bch2_prt_u64_base2_nbits(out, v, fls64(v) ?: 1);
 }
 
+static bool string_is_spaces(const char *str)
+{
+	while (*str) {
+		if (*str != ' ')
+			return false;
+		str++;
+	}
+	return true;
+}
+
 void bch2_print_string_as_lines(const char *prefix, const char *lines,
 				bool nonblocking)
 {
@@ -272,6 +282,9 @@ void bch2_print_string_as_lines(const char *prefix, const char *lines,
 
 	while (*lines) {
 		p = strchrnul(lines, '\n');
+		if (!*p && string_is_spaces(lines))
+			break;
+
 		printk("%s%.*s\n", prefix, (int) (p - lines), lines);
 		if (!*p)
 			break;