diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-12-17 09:26:29 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-12-17 09:26:29 -0500 |
| commit | f9ba96e16535a653b97f7f1f953fabf477737a96 (patch) | |
| tree | 012aed6c10dbdcdb1ec2a223d7070f3eb6249139 /libbcachefs/opts.c | |
| parent | a10a41fa2b1a917b0f3b34d20175867f968b2d12 (diff) | |
Update bcachefs sources to 57ea7773cb bcachefs: Fix duplicate ioctl nr
Diffstat (limited to 'libbcachefs/opts.c')
| -rw-r--r-- | libbcachefs/opts.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libbcachefs/opts.c b/libbcachefs/opts.c index 449cd5bf..4739f782 100644 --- a/libbcachefs/opts.c +++ b/libbcachefs/opts.c @@ -376,40 +376,40 @@ no_val: struct bch_io_opts bch2_opts_to_inode_opts(struct bch_opts src) { struct bch_io_opts ret = { 0 }; -#define BCH_INODE_OPT(_name, _bits) \ +#define x(_name, _bits) \ if (opt_defined(src, _name)) \ opt_set(ret, _name, src._name); BCH_INODE_OPTS() -#undef BCH_INODE_OPT +#undef x return ret; } struct bch_opts bch2_inode_opts_to_opts(struct bch_io_opts src) { struct bch_opts ret = { 0 }; -#define BCH_INODE_OPT(_name, _bits) \ +#define x(_name, _bits) \ if (opt_defined(src, _name)) \ opt_set(ret, _name, src._name); BCH_INODE_OPTS() -#undef BCH_INODE_OPT +#undef x return ret; } void bch2_io_opts_apply(struct bch_io_opts *dst, struct bch_io_opts src) { -#define BCH_INODE_OPT(_name, _bits) \ +#define x(_name, _bits) \ if (opt_defined(src, _name)) \ opt_set(*dst, _name, src._name); BCH_INODE_OPTS() -#undef BCH_INODE_OPT +#undef x } bool bch2_opt_is_inode_opt(enum bch_opt_id id) { static const enum bch_opt_id inode_opt_list[] = { -#define BCH_INODE_OPT(_name, _bits) Opt_##_name, +#define x(_name, _bits) Opt_##_name, BCH_INODE_OPTS() -#undef BCH_INODE_OPT +#undef x }; unsigned i; |