From: Integral <integral@archlinuxcn.org>
To: kent.overstreet@gmail.com, kent.overstreet@linux.dev,
lihongbo22@huawei.com
Cc: mmpgouride@gmail.com, linux-bcachefs@vger.kernel.org,
integral@archlinuxcn.org
Subject: [PATCH resend] bcachefs-tools: fix build failure when BCACHEFS_FUSE=1
Date: Sat, 26 Oct 2024 12:28:09 +0800 [thread overview]
Message-ID: <20241026042807.483324-3-integral@archlinuxcn.org> (raw)
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 <integral@archlinuxcn.org>
---
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));
--
2.47.0
next reply other threads:[~2024-10-26 4:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-26 4:28 Integral [this message]
2024-10-26 5:48 ` [PATCH resend] bcachefs-tools: fix build failure when BCACHEFS_FUSE=1 Kent Overstreet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241026042807.483324-3-integral@archlinuxcn.org \
--to=integral@archlinuxcn.org \
--cc=kent.overstreet@gmail.com \
--cc=kent.overstreet@linux.dev \
--cc=lihongbo22@huawei.com \
--cc=linux-bcachefs@vger.kernel.org \
--cc=mmpgouride@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox