diff options
Diffstat (limited to 'c_src')
| -rw-r--r-- | c_src/cmd_dump.c | 4 | ||||
| -rw-r--r-- | c_src/cmd_fsck.c | 3 | ||||
| -rw-r--r-- | c_src/cmd_migrate.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/c_src/cmd_dump.c b/c_src/cmd_dump.c index f54ea85d..f89d83ae 100644 --- a/c_src/cmd_dump.c +++ b/c_src/cmd_dump.c @@ -153,7 +153,7 @@ int cmd_dump(int argc, char *argv[]) if (IS_ERR(c)) die("error opening devices: %s", bch2_err_str(PTR_ERR(c))); - down_read(&c->gc_lock); + down_read(&c->state_lock); for_each_online_member(c, ca) nr_devices++; @@ -176,7 +176,7 @@ int cmd_dump(int argc, char *argv[]) close(fd); } - up_read(&c->gc_lock); + up_read(&c->state_lock); bch2_fs_stop(c); return 0; diff --git a/c_src/cmd_fsck.c b/c_src/cmd_fsck.c index 580df0d5..3d47af6c 100644 --- a/c_src/cmd_fsck.c +++ b/c_src/cmd_fsck.c @@ -236,6 +236,7 @@ int cmd_fsck(int argc, char *argv[]) kernel_probed = should_use_kernel_fsck(devs); struct bch_opts opts = bch2_opts_empty(); + struct printbuf parse_later = PRINTBUF; if (kernel_probed) { struct bch_ioctl_fsck_offline *fsck = calloc(sizeof(*fsck) + @@ -259,7 +260,7 @@ int cmd_fsck(int argc, char *argv[]) ret = splice_fd_to_stdinout(fsck_fd); } else { userland_fsck: - ret = bch2_parse_mount_opts(NULL, &opts, opts_str.buf); + ret = bch2_parse_mount_opts(NULL, &opts, &parse_later, opts_str.buf); if (ret) return ret; diff --git a/c_src/cmd_migrate.c b/c_src/cmd_migrate.c index 81c57c09..24937822 100644 --- a/c_src/cmd_migrate.c +++ b/c_src/cmd_migrate.c @@ -126,7 +126,7 @@ static void update_inode(struct bch_fs *c, bch2_inode_pack(&packed, inode); packed.inode.k.p.snapshot = U32_MAX; ret = bch2_btree_insert(c, BTREE_ID_inodes, &packed.inode.k_i, - NULL, 0); + NULL, 0, 0); if (ret) die("error updating inode: %s", bch2_err_str(ret)); } @@ -340,7 +340,7 @@ static void link_data(struct bch_fs *c, struct bch_inode_unpacked *dst, die("error reserving space in new filesystem: %s", bch2_err_str(ret)); - ret = bch2_btree_insert(c, BTREE_ID_extents, &e->k_i, &res, 0); + ret = bch2_btree_insert(c, BTREE_ID_extents, &e->k_i, &res, 0, 0); if (ret) die("btree insert error %s", bch2_err_str(ret)); |