diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2025-03-19 12:33:40 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2025-03-24 09:50:35 -0400 |
| commit | af2ff37da7ad6aabb79f57c9f7331600bd2b982d (patch) | |
| tree | 7270e453dc72f52b2deefb99e0f6f63563e889b0 | |
| parent | 5d361ae5afeef075264b369c413dbed0a0d04cfa (diff) | |
bcachefs: Fix block/btree node size defaults
We're fixing option parsing in userspace, it now obeys
OPT_SB_FIELD_SECTORS
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/opts.c | 6 | ||||
| -rw-r--r-- | fs/bcachefs/opts.h | 9 |
2 files changed, 4 insertions, 11 deletions
diff --git a/fs/bcachefs/opts.c b/fs/bcachefs/opts.c index d0ce96529dd4..81fd6b7977d3 100644 --- a/fs/bcachefs/opts.c +++ b/fs/bcachefs/opts.c @@ -684,12 +684,10 @@ void __bch2_opt_set_sb(struct bch_sb *sb, int dev_idx, if (opt->flags & OPT_SB_FIELD_ONE_BIAS) v++; - if ((opt->flags & OPT_FS) && opt->set_sb) + if ((opt->flags & OPT_FS) && opt->set_sb && dev_idx < 0) opt->set_sb(sb, v); - if ((opt->flags & OPT_DEVICE) && - opt->set_member && - dev_idx >= 0) { + if ((opt->flags & OPT_DEVICE) && opt->set_member && dev_idx >= 0) { if (WARN(!bch2_member_exists(sb, dev_idx), "tried to set device option %s on nonexistent device %i", opt->attr.name, dev_idx)) diff --git a/fs/bcachefs/opts.h b/fs/bcachefs/opts.h index 0bf39e4b1c8e..bb621804d45a 100644 --- a/fs/bcachefs/opts.h +++ b/fs/bcachefs/opts.h @@ -128,13 +128,13 @@ enum fsck_err_opts { OPT_FS|OPT_FORMAT| \ OPT_HUMAN_READABLE|OPT_MUST_BE_POW_2|OPT_SB_FIELD_SECTORS, \ OPT_UINT(512, 1U << 16), \ - BCH_SB_BLOCK_SIZE, 8, \ + BCH_SB_BLOCK_SIZE, 4 << 10, \ "size", NULL) \ x(btree_node_size, u32, \ OPT_FS|OPT_FORMAT| \ OPT_HUMAN_READABLE|OPT_MUST_BE_POW_2|OPT_SB_FIELD_SECTORS, \ OPT_UINT(512, 1U << 20), \ - BCH_SB_BTREE_NODE_SIZE, 512, \ + BCH_SB_BTREE_NODE_SIZE, 256 << 10, \ "size", "Btree node size, default 256k") \ x(errors, u8, \ OPT_FS|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME, \ @@ -499,11 +499,6 @@ enum fsck_err_opts { OPT_STR(bch2_member_states), \ BCH_MEMBER_STATE, BCH_MEMBER_STATE_rw, \ "state", "rw,ro,failed,spare") \ - x(fs_size, u64, \ - OPT_DEVICE|OPT_HIDDEN, \ - OPT_UINT(0, S64_MAX), \ - BCH2_NO_MEMBER_OPT, 0, \ - "size", "Size of filesystem on device") \ x(bucket_size, u32, \ OPT_DEVICE|OPT_HUMAN_READABLE|OPT_SB_FIELD_SECTORS, \ OPT_UINT(0, S64_MAX), \ |