alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-12-10 00:00:24 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

cmd_show_super: Use bch2_fs_open()

Browse Source 
We're getting away from reading bare superblocks in CLI tools, and we
need a filesystem object to fix a null ptr deref when printing
bch_sb_field_clean.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2025-12-07 19:53:52 -05:00
parent 0789cac166
commit 38c8860f63
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
c_src/cmd_super.c
View File

@ -26,6 +26,8 @@
#include "bcachefs.h"
#include "init/fs.h"
#include "sb/io.h"
#include "sb/members.h"
@ -164,33 +166,40 @@ int cmd_show_super(int argc, char *argv[])
if (argc)
die("too many arguments");
CLASS(darray_const_str, devs)();
darray_push(&devs, dev);
struct bch_opts opts = bch2_opts_empty();
opt_set(opts, noexcl, true);
opt_set(opts, nochanges, true);
opt_set(opts, no_version_check, true);
opt_set(opts, nostart, true);
struct bch_sb_handle sb;
int ret = bch2_read_super(dev, &opts, &sb);
struct bch_fs *c = bch2_fs_open(&devs, &opts);
int ret = PTR_ERR_OR_ZERO(c);
if (ret)
die("Error opening %s: %s", dev, bch2_err_str(ret));
if (print_default_fields) {
fields |= bch2_sb_field_get(sb.sb, members_v2)
? BIT(BCH_SB_FIELD_members_v2)
: BIT(BCH_SB_FIELD_members_v1);
fields |= BIT(BCH_SB_FIELD_errors);
/* only one member will be online */
for_each_online_member(c, ca, 0) {
struct bch_sb *sb = ca->disk_sb.sb;
CLASS(printbuf, buf)();
buf.human_readable_units = true;
if (print_default_fields) {
fields |= bch2_sb_field_get(sb, members_v2)
? BIT(BCH_SB_FIELD_members_v2)
: BIT(BCH_SB_FIELD_members_v1);
fields |= BIT(BCH_SB_FIELD_errors);
}
bch2_sb_to_text_with_names(&buf, sb, print_layout, fields, field_only);
printf("%s", buf.buf);
}
struct printbuf buf = PRINTBUF;
buf.human_readable_units = true;
bch2_sb_to_text_with_names(&buf, sb.sb, print_layout, fields, field_only);
printf("%s", buf.buf);
bch2_free_super(&sb);
printbuf_exit(&buf);
bch2_fs_exit(c);
return 0;
}