diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-02-15 23:45:29 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-02-15 23:45:29 -0500 |
| commit | e773e86495534ede8efc0f3059cf0939c374a925 (patch) | |
| tree | e928013e6080cd1bb78901a9e29fe000650220ed /libbcachefs/super-io.c | |
| parent | f2ba586baf981af0e31f160325a51849089f6584 (diff) | |
Update bcachefs sources to 9a555a741e80 bcachefs: omit alignment attribute on big endian struct bkeyv1.6.2
Diffstat (limited to 'libbcachefs/super-io.c')
| -rw-r--r-- | libbcachefs/super-io.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libbcachefs/super-io.c b/libbcachefs/super-io.c index 36988add..a3a9e85a 100644 --- a/libbcachefs/super-io.c +++ b/libbcachefs/super-io.c @@ -717,6 +717,7 @@ retry: if (IS_ERR(sb->bdev_handle)) { ret = PTR_ERR(sb->bdev_handle); + prt_printf(&err, "error opening %s: %s", path, bch2_err_str(ret)); goto err; } sb->bdev = sb->bdev_handle->bdev; @@ -743,9 +744,9 @@ retry: prt_printf(&err2, "bcachefs (%s): error reading default superblock: %s\n", path, err.buf); if (ret == -BCH_ERR_invalid_sb_magic && ignore_notbchfs_msg) - printk(KERN_INFO "%s", err2.buf); + bch2_print_opts(opts, KERN_INFO "%s", err2.buf); else - printk(KERN_ERR "%s", err2.buf); + bch2_print_opts(opts, KERN_ERR "%s", err2.buf); printbuf_exit(&err2); printbuf_reset(&err); @@ -808,16 +809,16 @@ got_super: ret = bch2_sb_validate(sb, &err, READ); if (ret) { - printk(KERN_ERR "bcachefs (%s): error validating superblock: %s\n", - path, err.buf); + bch2_print_opts(opts, KERN_ERR "bcachefs (%s): error validating superblock: %s\n", + path, err.buf); goto err_no_print; } out: printbuf_exit(&err); return ret; err: - printk(KERN_ERR "bcachefs (%s): error reading superblock: %s\n", - path, err.buf); + bch2_print_opts(opts, KERN_ERR "bcachefs (%s): error reading superblock: %s\n", + path, err.buf); err_no_print: bch2_free_super(sb); goto out; |