From ff2b85e039b2dc164477c1ac57844a6f456526aa Mon Sep 17 00:00:00 2001 From: Justin Husted Date: Sat, 28 Dec 2019 15:56:49 -0800 Subject: bcachefs-tools: Fix build errors. The BTREE_INSERT_ATOMIC removal broke fuse. Signed-off-by: Justin Husted --- cmd_fusemount.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'cmd_fusemount.c') diff --git a/cmd_fusemount.c b/cmd_fusemount.c index 5418a556..54bc76cd 100644 --- a/cmd_fusemount.c +++ b/cmd_fusemount.c @@ -210,7 +210,6 @@ retry: ret = bch2_inode_write(&trans, iter, &inode_u) ?: bch2_trans_commit(&trans, NULL, NULL, - BTREE_INSERT_ATOMIC| BTREE_INSERT_NOFAIL); err: if (ret == -EINTR) @@ -237,7 +236,7 @@ static int do_create(struct bch_fs *c, u64 dir, bch2_inode_init_early(c, new_inode); - return bch2_trans_do(c, NULL, BTREE_INSERT_ATOMIC, + return bch2_trans_do(c, NULL, NULL, 0, bch2_create_trans(&trans, dir, &dir_u, new_inode, &qstr, @@ -289,7 +288,7 @@ static void bcachefs_fuse_unlink(fuse_req_t req, fuse_ino_t dir, dir = map_root_ino(dir); - ret = bch2_trans_do(c, NULL, BTREE_INSERT_ATOMIC|BTREE_INSERT_NOFAIL, + ret = bch2_trans_do(c, NULL, NULL, BTREE_INSERT_NOFAIL, bch2_unlink_trans(&trans, dir, &dir_u, &inode_u, &qstr)); @@ -326,7 +325,7 @@ static void bcachefs_fuse_rename(fuse_req_t req, dst_dir = map_root_ino(dst_dir); /* XXX handle overwrites */ - ret = bch2_trans_do(c, NULL, BTREE_INSERT_ATOMIC, + ret = bch2_trans_do(c, NULL, NULL, 0, bch2_rename_trans(&trans, src_dir, &src_dir_u, dst_dir, &dst_dir_u, @@ -350,7 +349,7 @@ static void bcachefs_fuse_link(fuse_req_t req, fuse_ino_t inum, newparent = map_root_ino(newparent); - ret = bch2_trans_do(c, NULL, BTREE_INSERT_ATOMIC, + ret = bch2_trans_do(c, NULL, NULL, 0, bch2_link_trans(&trans, newparent, inum, &dir_u, &inode_u, &qstr)); @@ -546,7 +545,7 @@ retry: goto err; ret = bch2_trans_commit(&trans, NULL, NULL, - BTREE_INSERT_ATOMIC|BTREE_INSERT_NOFAIL); + BTREE_INSERT_NOFAIL); err: if (ret == -EINTR) -- cgit v1.2.3