-static inline int o_match(struct fio_option *o, const char *opt)
-{
- if (!strcmp(o->name, opt))
- return 1;
- else if (o->alias && !strcmp(o->alias, opt))
- return 1;
-
- return 0;
-}
-
-static struct fio_option *find_option(struct fio_option *options,
- struct flist_head *eops, const char *opt)
-{
- struct flist_head *n;
- struct fio_option *o;
-
- for (o = &options[0]; o->name; o++)
- if (o_match(o, opt))
- return o;
-
- if (!eops)
- return NULL;
-
- flist_for_each(n, eops) {
- struct ext_option *eopt;
-
- eopt = flist_entry(n, struct ext_option, list);
- if (o_match(&eopt->o, opt))
- return &eopt->o;
- }
-
- return NULL;
-}
-
-#define val_store(ptr, val, off, data) \
+#define val_store(ptr, val, off, or, data) \