btrfs-progs: convert: fix build on musl

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

diff --git a/convert/source-reiserfs.c b/convert/source-reiserfs.c
index d6389bf..39d6f07 100644 (file)
--- a/convert/source-reiserfs.c
+++ b/convert/source-reiserfs.c
@@ -376,7 +376,7 @@ static int reiserfs_convert_tail(struct btrfs_trans_handle *trans,
        u64 isize;
        int ret;
 
-       if (length >= BTRFS_MAX_INLINE_DATA_SIZE(root))
+       if (length >= BTRFS_MAX_INLINE_DATA_SIZE(root->fs_info))
                return convert_direct(trans, root, objectid, inode, body,
                                      length, offset, convert_flags);
 
@@ -500,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++,
@@ -613,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,
@@ -629,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;
                }
 
@@ -639,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,
@@ -650,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;
                }
        }
@@ -676,7 +676,7 @@ static int reiserfs_xattr_indirect_fn(reiserfs_filsys_t fs, u64 position,
        size_t alloc = min(position + num_blocks * fs->fs_blocksize, size);
        char *body;
 
-       if (size > BTRFS_LEAF_DATA_SIZE(xa_data->root) -
+       if (size > BTRFS_LEAF_DATA_SIZE(xa_data->root->fs_info) -
            sizeof(struct btrfs_item) - sizeof(struct btrfs_dir_item)) {
                fprintf(stderr, "skip large xattr on objectid %llu name %.*s\n",
                        xa_data->target_oid, (int)xa_data->namelen,
@@ -714,7 +714,7 @@ static int reiserfs_xattr_direct_fn(reiserfs_filsys_t fs, __u64 position,
        struct reiserfs_xattr_data *xa_data = data;
        char *newbody;
 
-       if (size > BTRFS_LEAF_DATA_SIZE(xa_data->root) -
+       if (size > BTRFS_LEAF_DATA_SIZE(xa_data->root->fs_info) -
            sizeof(struct btrfs_item) - sizeof(struct btrfs_dir_item)) {
                fprintf(stderr, "skip large xattr on objectid %llu name %.*s\n",
                        xa_data->target_oid, (int)xa_data->namelen,
@@ -872,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);