From 5350fd2b7b63a1e1ef006f2c4ce9fbbec35b9ff9 Mon Sep 17 00:00:00 2001 From: Integral Date: Sat, 26 Oct 2024 12:28:09 +0800 Subject: [PATCH] bcachefs-tools: fix build failure when BCACHEFS_FUSE=1 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 Signed-off-by: Kent Overstreet --- c_src/cmd_fusemount.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/c_src/cmd_fusemount.c b/c_src/cmd_fusemount.c index 50d35832..babdb6fb 100644 --- a/c_src/cmd_fusemount.c +++ b/c_src/cmd_fusemount.c @@ -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, @@ -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)); @@ -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, @@ -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));