X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=convert%2Fsource-reiserfs.c;h=39d6f0728bd314926cf6ed7050238b4b2e65ed23;hb=f37ae8d275c2f988c9fc967f8272648fb0118d3d;hp=be79d8e2f4a631a88ec53e6c16445072d89f9f0e;hpb=448999d84ddc2eaf36938176fb5091d2c2029e2f;p=platform%2Fupstream%2Fbtrfs-progs.git diff --git a/convert/source-reiserfs.c b/convert/source-reiserfs.c index be79d8e..39d6f07 100644 --- 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); @@ -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,