diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2025-09-01 21:51:25 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2025-09-07 20:43:23 -0400 |
| commit | aa5bd95e3c06c008c0fb234e08868f1703c00417 (patch) | |
| tree | 7fb45dcb25108d37f9ce77fb0daf014f96171f59 /c_src | |
| parent | aea20002399963c498c3a3290cfd7c229108f56c (diff) | |
Update bcachefs sources to 292344971769 bcachefs: Read retries are after checksum errors now REQ_FUA
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'c_src')
| -rw-r--r-- | c_src/cmd_image.c | 2 | ||||
| -rw-r--r-- | c_src/cmd_option.c | 4 | ||||
| -rw-r--r-- | c_src/posix_to_bcachefs.c | 9 |
3 files changed, 9 insertions, 6 deletions
diff --git a/c_src/cmd_image.c b/c_src/cmd_image.c index 9da3ed34..00f0c6f4 100644 --- a/c_src/cmd_image.c +++ b/c_src/cmd_image.c @@ -90,7 +90,7 @@ struct move_btree_args { static bool move_btree_pred(struct bch_fs *c, void *_arg, enum btree_id btree, struct bkey_s_c k, - struct bch_io_opts *io_opts, + struct bch_inode_opts *io_opts, struct data_update_opts *data_opts) { struct move_btree_args *args = _arg; diff --git a/c_src/cmd_option.c b/c_src/cmd_option.c index 14201c8d..433d6196 100644 --- a/c_src/cmd_option.c +++ b/c_src/cmd_option.c @@ -117,7 +117,7 @@ int cmd_set_option(int argc, char *argv[]) fprintf(stderr, "Can't set option %s\n", opt->attr.name); if (opt->flags & OPT_FS) { - ret = bch2_opt_hook_pre_set(c, NULL, i, v); + ret = bch2_opt_hook_pre_set(c, NULL, 0, i, v); if (ret < 0) { fprintf(stderr, "error setting %s: %i\n", opt->attr.name, ret); continue; @@ -135,7 +135,7 @@ int cmd_set_option(int argc, char *argv[]) continue; } - ret = bch2_opt_hook_pre_set(c, ca, i, v); + ret = bch2_opt_hook_pre_set(c, ca, 0, i, v); if (ret < 0) { fprintf(stderr, "error setting %s: %i\n", opt->attr.name, ret); continue; diff --git a/c_src/posix_to_bcachefs.c b/c_src/posix_to_bcachefs.c index e80a3564..1d499b9e 100644 --- a/c_src/posix_to_bcachefs.c +++ b/c_src/posix_to_bcachefs.c @@ -252,8 +252,8 @@ static void read_data(struct bch_fs *c, rbio.bio.bi_private = &cl; bch2_bio_map(&rbio.bio, buf, len); - struct bch_io_opts opts; - bch2_inode_opts_get(&opts, c, inode); + struct bch_inode_opts opts; + bch2_inode_opts_get_inode(c, inode, &opts); rbio_init(&rbio.bio, c, opts, read_data_endio); @@ -279,7 +279,10 @@ static void write_data(struct bch_fs *c, bio_init(&op.wbio.bio, NULL, bv, ARRAY_SIZE(bv), 0); bch2_bio_map(&op.wbio.bio, buf, len); - bch2_write_op_init(&op, c, bch2_opts_to_inode_opts(c->opts)); + struct bch_inode_opts opts; + bch2_inode_opts_get(c, &opts); + + bch2_write_op_init(&op, c, opts); op.write_point = writepoint_hashed(0); op.nr_replicas = 1; op.subvol = 1; |