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. [1] Link: https://lore.kernel.org/[email protected] Signed-off-by: Integral <[email protected]> --- fs/bcachefs/compress.c | 4 ++-- fs/bcachefs/opts.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/bcachefs/compress.c b/fs/bcachefs/compress.c index d68c3c7896a3..1bca61d17092 100644 --- 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 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
