Merge pull request #196 from Conan-Kudo/spec-libexecdir

[bcachefs-tools-debian] / libbcachefs / fs-common.c

diff --git a/libbcachefs/fs-common.c b/libbcachefs/fs-common.c
index e9dd1d13ec7e97d39acf2b2472092934b06508b5..4496cf91a4c17bcde4e4a934eb0475007ff1311c 100644 (file)
--- a/libbcachefs/fs-common.c
+++ b/libbcachefs/fs-common.c
@@ -51,7 +51,7 @@ int bch2_create_trans(struct btree_trans *trans,
                bch2_inode_init_late(new_inode, now, uid, gid, mode, rdev, dir_u);
 
                if (flags & BCH_CREATE_TMPFILE)
-                       new_inode->bi_flags |= BCH_INODE_UNLINKED;
+                       new_inode->bi_flags |= BCH_INODE_unlinked;
 
                ret = bch2_inode_create(trans, &inode_iter, new_inode, snapshot, cpu);
                if (ret)
@@ -281,7 +281,7 @@ int bch2_unlink_trans(struct btree_trans *trans,
        }
 
        if (deleting_snapshot && !inode_u->bi_subvol) {
-               ret = -ENOENT;
+               ret = -BCH_ERR_ENOENT_not_subvol;
                goto err;
        }
 
@@ -487,11 +487,11 @@ int bch2_rename_trans(struct btree_trans *trans,
        ret =   bch2_inode_write(trans, &src_dir_iter, src_dir_u) ?:
                (src_dir.inum != dst_dir.inum
                 ? bch2_inode_write(trans, &dst_dir_iter, dst_dir_u)
-                : 0 ) ?:
+                : 0) ?:
                bch2_inode_write(trans, &src_inode_iter, src_inode_u) ?:
                (dst_inum.inum
                 ? bch2_inode_write(trans, &dst_inode_iter, dst_inode_u)
-                : 0 );
+                : 0);
 err:
        bch2_trans_iter_exit(trans, &dst_inode_iter);
        bch2_trans_iter_exit(trans, &src_inode_iter);