From: Integral <integral@archlinuxcn.org>
To: Kent Overstreet <kent.overstreet@linux.dev>
Cc: linux-bcachefs@vger.kernel.org, linux-kernel@vger.kernel.org,
Integral <integral@archlinuxcn.org>
Subject: [PATCH] bcachefs: indent error messages of invalid compression
Date: Tue, 8 Apr 2025 01:41:31 +0800 [thread overview]
Message-ID: <20250407174129.251920-3-integral@archlinuxcn.org> (raw)
This patch uses printbuf_indent_add_nextline() to set a consistent
indentation level for error messages of invalid compression.
In my previous patch [1], the newline is added by using '\n' in
the argument of prt_str(). This patch replaces '\n' with prt_newline()
to make indentation level work correctly.
[1] Link: https://lore.kernel.org/20250406152659.205997-2-integral@archlinuxcn.org
Signed-off-by: Integral <integral@archlinuxcn.org>
---
fs/bcachefs/compress.c | 12 ++++++++----
fs/bcachefs/opts.c | 1 +
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/fs/bcachefs/compress.c b/fs/bcachefs/compress.c
index d68c3c7896a3..a107aa88a875 100644
--- a/fs/bcachefs/compress.c
+++ b/fs/bcachefs/compress.c
@@ -713,8 +713,10 @@ int bch2_opt_compression_parse(struct bch_fs *c, const char *_val, u64 *res,
level_str = p;
ret = match_string(bch2_compression_opts, -1, type_str);
- if (ret < 0 && err)
- prt_str(err, "invalid compression type\n");
+ if (ret < 0 && err) {
+ prt_str(err, "invalid compression type");
+ prt_newline(err);
+ }
if (ret < 0)
goto err;
@@ -728,8 +730,10 @@ int bch2_opt_compression_parse(struct bch_fs *c, const char *_val, u64 *res,
ret = -EINVAL;
if (!ret && level > 15)
ret = -EINVAL;
- if (ret < 0 && err)
- prt_str(err, "invalid compression level\n");
+ if (ret < 0 && err) {
+ prt_str(err, "invalid compression level");
+ prt_newline(err);
+ }
if (ret < 0)
goto err;
diff --git a/fs/bcachefs/opts.c b/fs/bcachefs/opts.c
index cd7b0cd293c7..f35fde896253 100644
--- a/fs/bcachefs/opts.c
+++ b/fs/bcachefs/opts.c
@@ -365,6 +365,7 @@ int bch2_opt_parse(struct bch_fs *c,
struct printbuf *err)
{
ssize_t ret;
+ printbuf_indent_add_nextline(err, 2);
switch (opt->type) {
case BCH_OPT_BOOL:
base-commit: 4d37602fceff942694069cf33cc55863277bd1c2
--
2.49.0
next reply other threads:[~2025-04-07 17:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-07 17:41 Integral [this message]
2025-04-07 18:43 ` [PATCH] bcachefs: indent error messages of invalid compression Kent Overstreet
2025-04-08 10:31 ` [PATCH v2] " Integral
2025-04-10 0:05 ` Kent Overstreet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250407174129.251920-3-integral@archlinuxcn.org \
--to=integral@archlinuxcn.org \
--cc=kent.overstreet@linux.dev \
--cc=linux-bcachefs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.