Update bcachefs sources to 56d76a11ee04 bcachefs: opts.mount_trusts_udev

This commit is contained in:
Kent Overstreet 2025-11-30 15:33:54 -05:00
parent 8c851d4747
commit 9200be7c51
4 changed files with 17 additions and 11 deletions

View File

@ -1 +1 @@
6ba867b0c788d0f32e8dc142172d60ead6273f1b
56d76a11ee0410a197639f978efd2b13e6968143

View File

@ -1925,8 +1925,7 @@ long bch2_ioctl_fsck_offline(struct bch_ioctl_fsck_offline __user *user_arg)
{
struct bch_ioctl_fsck_offline arg;
if (copy_from_user(&arg, user_arg, sizeof(arg)))
return -EFAULT;
try(copy_from_user_errcode(&arg, user_arg, sizeof(arg)));
if (arg.flags)
return -EINVAL;

View File

@ -860,6 +860,15 @@ bool bch2_opt_set_sb(struct bch_fs *c, struct bch_dev *ca,
return changed;
}
const __maybe_unused struct bch_opts bch2_opts_default = {
#define x(_name, _bits, _mode, _type, _sb_opt, _default, ...) \
._name##_defined = true, \
._name = _default, \
BCH_OPTS()
#undef x
};
/* io opts: */
void bch2_inode_opts_get(struct bch_fs *c, struct bch_inode_opts *ret, bool metadata)

View File

@ -314,6 +314,11 @@ enum fsck_err_opts {
OPT_STR(bch2_degraded_actions), \
BCH_SB_DEGRADED_ACTION, BCH_DEGRADED_ask, \
NULL, "Allow mounting in degraded mode") \
x(mount_trusts_udev, u8, \
OPT_MOUNT, \
OPT_BOOL(), \
BCH2_NO_SB_OPT, true, \
NULL, "Trust udev when scanning for member devices") \
x(no_splitbrain_check, u8, \
OPT_FS|OPT_MOUNT, \
OPT_BOOL(), \
@ -580,14 +585,7 @@ struct bch2_opts_parse {
struct printbuf parse_later;
};
static const __maybe_unused struct bch_opts bch2_opts_default = {
#define x(_name, _bits, _mode, _type, _sb_opt, _default, ...) \
._name##_defined = true, \
._name = _default, \
BCH_OPTS()
#undef x
};
extern const struct bch_opts bch2_opts_default;
#define opt_defined(_opts, _name) ((_opts)._name##_defined)