btrfs-progs: fsck-test: Add new image with shared block ref only metadata backref

[platform/upstream/btrfs-progs.git] / convert / source-reiserfs.c

diff --git a/convert/source-reiserfs.c b/convert/source-reiserfs.c
index 22a3590..be79d8e 100644 (file)
--- a/convert/source-reiserfs.c
+++ b/convert/source-reiserfs.c
@@ -44,20 +44,6 @@ static inline u8 mode_to_file_type(u32 mode)
        return BTRFS_FT_UNKNOWN;
 }
 
-struct reiserfs_convert_info {
-       bool copy_attrs;
-       struct reiserfs_key privroot_key;
-       struct reiserfs_key xattr_key;
-
-       /* only set during copy_inodes */
-       struct task_ctx *progress;
-
-       /* used to track hardlinks */
-       unsigned used_slots;
-       unsigned alloced_slots;
-       u64 *objectids;
-};
-
 static u32 reiserfs_count_objectids(reiserfs_filsys_t fs)
 {
        struct reiserfs_super_block *sb = fs->fs_ondisk_sb;
@@ -279,13 +265,6 @@ static void reiserfs_copy_inode_item(struct btrfs_inode_item *inode,
        btrfs_set_stack_inode_rdev(inode, rdev);
 }
 
-struct reiserfs_blk_iterate_data {
-       struct blk_iterate_data blk_data;
-       char *inline_data;
-       u64 inline_offset;
-       u32 inline_length;
-};
-
 static void init_reiserfs_blk_iterate_data(
                                struct reiserfs_blk_iterate_data *data,
                                struct btrfs_trans_handle *trans,
@@ -485,18 +464,10 @@ fail:
        return ret;
 }
 
-#define OID_OFFSET (BTRFS_FIRST_FREE_OBJECTID - REISERFS_ROOT_OBJECTID)
 static int reiserfs_copy_meta(reiserfs_filsys_t fs, struct btrfs_root *root,
                              u32 convert_flags, u32 deh_dirid,
                              u32 deh_objectid, u8 *type);
 
-struct reiserfs_dirent_data {
-       u64 index;
-       u32 convert_flags;
-       struct btrfs_inode_item *inode;
-       struct btrfs_root *root;
-};
-
 static int reiserfs_copy_dirent(reiserfs_filsys_t fs,
                                const struct reiserfs_key *dir_short_key,
                                const char *name, size_t len,
@@ -529,8 +500,8 @@ static int reiserfs_copy_dirent(reiserfs_filsys_t fs,
                return ret;
        }
        trans = btrfs_start_transaction(root, 1);
-       if (!trans)
-               return -ENOMEM;
+       if (IS_ERR(trans))
+               return PTR_ERR(trans);
 
        ret = convert_insert_dirent(trans, root, name, len, dir_objectid,
                                    objectid, type, dirent_data->index++,
@@ -642,8 +613,8 @@ static int reiserfs_copy_meta(reiserfs_filsys_t fs, struct btrfs_root *root,
        switch (mode & S_IFMT) {
        case S_IFREG:
                trans = btrfs_start_transaction(root, 1);
-               if (!trans) {
-                       ret = -ENOMEM;
+               if (IS_ERR(trans)) {
+                       ret = PTR_ERR(trans);
                        goto fail;
                }
                ret = reiserfs_record_file_extents(fs, trans, root, objectid,
@@ -658,8 +629,8 @@ static int reiserfs_copy_meta(reiserfs_filsys_t fs, struct btrfs_root *root,
                if (ret)
                        goto fail;
                trans = btrfs_start_transaction(root, 1);
-               if (!trans) {
-                       ret = -ENOMEM;
+               if (IS_ERR(trans)) {
+                       ret = PTR_ERR(trans);
                        goto fail;
                }
 
@@ -668,8 +639,8 @@ static int reiserfs_copy_meta(reiserfs_filsys_t fs, struct btrfs_root *root,
                break;
        case S_IFLNK:
                trans = btrfs_start_transaction(root, 1);
-               if (!trans) {
-                       ret = -ENOMEM;
+               if (IS_ERR(trans)) {
+                       ret = PTR_ERR(trans);
                        goto fail;
                }
                ret = reiserfs_copy_symlink(trans, root, objectid,
@@ -679,8 +650,8 @@ static int reiserfs_copy_meta(reiserfs_filsys_t fs, struct btrfs_root *root,
                break;
        default:
                trans = btrfs_start_transaction(root, 1);
-               if (!trans) {
-                       ret = -ENOMEM;
+               if (IS_ERR(trans)) {
+                       ret = PTR_ERR(trans);
                        goto fail;
                }
        }
@@ -696,16 +667,6 @@ fail:
        return ret;
 }
 
-struct reiserfs_xattr_data {
-       struct btrfs_root *root;
-       struct btrfs_trans_handle *trans;
-       u64 target_oid;
-       const char *name;
-       size_t namelen;
-       void *body;
-       size_t len;
-};
-
 static int reiserfs_xattr_indirect_fn(reiserfs_filsys_t fs, u64 position,
                                      u64 size, int num_blocks,
                                      u32 *blocks, void *data)
@@ -911,8 +872,8 @@ static int reiserfs_copy_xattr_dir(reiserfs_filsys_t fs,
        xa_data->target_oid += OID_OFFSET;
 
        xa_data->trans = btrfs_start_transaction(xa_data->root, 1);
-       if (!xa_data->trans)
-               return -ENOMEM;
+       if (IS_ERR(xa_data->trans))
+               return PTR_ERR(xa_data->trans);
 
        ret = reiserfs_iterate_dir(fs, &dir_key,
                                    reiserfs_copy_one_xattr, xa_data);