Move c_src dirs back to toplevel

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

diff --git a/libbcachefs/fs-common.c b/libbcachefs/fs-common.c
index bb5305441f275938d4f76535a9b9bf1aaccf7934..1c1ea0f0c692a6fdd4c262ef184bbcdda32d154f 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)
@@ -166,10 +166,8 @@ int bch2_create_trans(struct btree_trans *trans,
                if (ret)
                        goto err;
 
-               if (c->sb.version >= bcachefs_metadata_version_inode_backpointers) {
-                       new_inode->bi_dir               = dir_u->bi_inum;
-                       new_inode->bi_dir_offset        = dir_offset;
-               }
+               new_inode->bi_dir               = dir_u->bi_inum;
+               new_inode->bi_dir_offset        = dir_offset;
        }
 
        inode_iter.flags &= ~BTREE_ITER_ALL_SNAPSHOTS;
@@ -228,10 +226,8 @@ int bch2_link_trans(struct btree_trans *trans,
        if (ret)
                goto err;
 
-       if (c->sb.version >= bcachefs_metadata_version_inode_backpointers) {
-               inode_u->bi_dir         = dir.inum;
-               inode_u->bi_dir_offset  = dir_offset;
-       }
+       inode_u->bi_dir         = dir.inum;
+       inode_u->bi_dir_offset  = dir_offset;
 
        ret =   bch2_inode_write(trans, &dir_iter, dir_u) ?:
                bch2_inode_write(trans, &inode_iter, inode_u);
@@ -414,21 +410,19 @@ int bch2_rename_trans(struct btree_trans *trans,
                        goto err;
        }
 
-       if (c->sb.version >= bcachefs_metadata_version_inode_backpointers) {
-               src_inode_u->bi_dir             = dst_dir_u->bi_inum;
-               src_inode_u->bi_dir_offset      = dst_offset;
+       src_inode_u->bi_dir             = dst_dir_u->bi_inum;
+       src_inode_u->bi_dir_offset      = dst_offset;
 
-               if (mode == BCH_RENAME_EXCHANGE) {
-                       dst_inode_u->bi_dir             = src_dir_u->bi_inum;
-                       dst_inode_u->bi_dir_offset      = src_offset;
-               }
+       if (mode == BCH_RENAME_EXCHANGE) {
+               dst_inode_u->bi_dir             = src_dir_u->bi_inum;
+               dst_inode_u->bi_dir_offset      = src_offset;
+       }
 
-               if (mode == BCH_RENAME_OVERWRITE &&
-                   dst_inode_u->bi_dir         == dst_dir_u->bi_inum &&
-                   dst_inode_u->bi_dir_offset  == src_offset) {
-                       dst_inode_u->bi_dir             = 0;
-                       dst_inode_u->bi_dir_offset      = 0;
-               }
+       if (mode == BCH_RENAME_OVERWRITE &&
+           dst_inode_u->bi_dir         == dst_dir_u->bi_inum &&
+           dst_inode_u->bi_dir_offset  == src_offset) {
+               dst_inode_u->bi_dir             = 0;
+               dst_inode_u->bi_dir_offset      = 0;
        }
 
        if (mode == BCH_RENAME_OVERWRITE) {