On Sun, Apr 06, 2025 at 11:26:59PM +0800, Integral wrote: > When an invalid compression type or level is passed as an argument > to `--compression`, two error messages are squashed into one line: > > > bcachefs format --compression=lzo bcachefs-comp.img > invalid option: invalid compression typecompression: parse error > > > bcachefs format --compression=lz4:16 bcachefs-comp.img > invalid option: invalid compression levelcompression: parse error > > To resolve this issue, add a newline character at the end of the > first error message to separate them into two lines. > > Signed-off-by: Integral <[email protected]>
Applied I've also been working on consistent indentation for multiline error/log messages, so that we can see grouping better. If you want to add that, the new helper is printbuf_indent_add_nextline() With that we can initialize a printbuffer and at the same time set it so that lines after the first are two space indented. > --- > fs/bcachefs/compress.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/bcachefs/compress.c b/fs/bcachefs/compress.c > index 28ed32449913..d68c3c7896a3 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"); > + prt_str(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"); > + prt_str(err, "invalid compression level\n"); > if (ret < 0) > goto err; > > -- > 2.49.0 >
