bcachefs: indent error messages of invalid compression

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 prt_str() with
prt_printf() to make indentation level work correctly.

Link: https://lore.kernel.org/20250406152659.205997-2-integral@archlinuxcn.org
Signed-off-by: Integral <integral@archlinuxcn.org>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/compress.c b/fs/bcachefs/compress.c
index d68c3c7896a3719319aed94006a822792f00a5ec..1bca61d170920bba48b22d04f6f00d32f6ce773b 100644 (file)
--- a/fs/bcachefs/compress.c
+++ b/fs/bcachefs/compress.c
@@ -714,7 +714,7 @@ int bch2_opt_compression_parse(struct bch_fs *c, const char *_val, u64 *res,
 
        ret = match_string(bch2_compression_opts, -1, type_str);
        if (ret < 0 && err)
-               prt_str(err, "invalid compression type\n");
+               prt_printf(err, "invalid compression type\n");
        if (ret < 0)
                goto err;
 
@@ -729,7 +729,7 @@ int bch2_opt_compression_parse(struct bch_fs *c, const char *_val, u64 *res,
                if (!ret && level > 15)
                        ret = -EINVAL;
                if (ret < 0 && err)
-                       prt_str(err, "invalid compression level\n");
+                       prt_printf(err, "invalid compression level\n");
                if (ret < 0)
                        goto err;
 

diff --git a/fs/bcachefs/opts.c b/fs/bcachefs/opts.c
index f40de111e5276eb23c8b75663d421df02ea85a85..ed2e2850c1d1b9469af761ff1141defb55d19623 100644 (file)
--- a/fs/bcachefs/opts.c
+++ b/fs/bcachefs/opts.c
@@ -337,6 +337,9 @@ int bch2_opt_parse(struct bch_fs *c,
 {
        ssize_t ret;
 
+       if (err)
+               printbuf_indent_add_nextline(err, 2);
+
        switch (opt->type) {
        case BCH_OPT_BOOL:
                if (val) {