Skip to content

Commit

Permalink
bcachefs-tools: fix build failure when BCACHEFS_FUSE=1
Browse files Browse the repository at this point in the history
Currently, when BCACHEFS_FUSE=1 is set, bcachefs-tools failed to build.
Replace "bch2_trans_do()" macro with "bch2_trans_commit_do()" in
cmd_fusemount.c to fix build failure.

Signed-off-by: Integral <[email protected]>
Signed-off-by: Kent Overstreet <[email protected]>
  • Loading branch information
Integral-Tech authored and Kent Overstreet committed Oct 26, 2024
1 parent cb8dc1b commit 5350fd2
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions c_src/cmd_fusemount.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ static int do_create(struct bch_fs *c, subvol_inum dir,

bch2_inode_init_early(c, new_inode);

return bch2_trans_do(c, NULL, NULL, 0,
return bch2_trans_commit_do(c, NULL, NULL, 0,
bch2_create_trans(trans,
dir, &dir_u,
new_inode, &qstr,
Expand Down Expand Up @@ -295,7 +295,7 @@ static void bcachefs_fuse_unlink(fuse_req_t req, fuse_ino_t dir_ino,

fuse_log(FUSE_LOG_DEBUG, "bcachefs_fuse_unlink(%llu, %s)\n", dir.inum, name);

int ret = bch2_trans_do(c, NULL, NULL,
int ret = bch2_trans_commit_do(c, NULL, NULL,
BCH_TRANS_COMMIT_no_enospc,
bch2_unlink_trans(trans, dir, &dir_u,
&inode_u, &qstr, false));
Expand Down Expand Up @@ -330,7 +330,7 @@ static void bcachefs_fuse_rename(fuse_req_t req,
src_dir.inum, srcname, dst_dir.inum, dstname, flags);

/* XXX handle overwrites */
ret = bch2_trans_do(c, NULL, NULL, 0,
ret = bch2_trans_commit_do(c, NULL, NULL, 0,
bch2_rename_trans(trans,
src_dir, &src_dir_u,
dst_dir, &dst_dir_u,
Expand All @@ -354,7 +354,7 @@ static void bcachefs_fuse_link(fuse_req_t req, fuse_ino_t ino,
fuse_log(FUSE_LOG_DEBUG, "bcachefs_fuse_link(%llu, %llu, %s)\n",
inum.inum, newparent.inum, newname);

ret = bch2_trans_do(c, NULL, NULL, 0,
ret = bch2_trans_commit_do(c, NULL, NULL, 0,
bch2_link_trans(trans, newparent, &dir_u,
inum, &inode_u, &qstr));

Expand Down

0 comments on commit 5350fd2

Please sign in to comment.