diff options
| author | Dimitri John Ledkov <xnox@ubuntu.com> | 2018-05-08 14:17:29 -0700 |
|---|---|---|
| committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2018-05-08 14:17:29 -0700 |
| commit | d00c9550da1801a0eaff5cedf4312e24691b31ea (patch) | |
| tree | 3881ca1764ef792259e1b70f12c884a3ac0c0715 /convert/source-reiserfs.c | |
| parent | dab6d2181f1f194ec3a76d900cf2c6533379cbea (diff) | |
New upstream release.
Diffstat (limited to 'convert/source-reiserfs.c')
| -rw-r--r-- | convert/source-reiserfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/convert/source-reiserfs.c b/convert/source-reiserfs.c index 39d6f072..e0b3b685 100644 --- a/convert/source-reiserfs.c +++ b/convert/source-reiserfs.c @@ -350,8 +350,7 @@ static int convert_direct(struct btrfs_trans_handle *trans, if (ret) return ret; - eb = alloc_extent_buffer(&root->fs_info->extent_cache, key.objectid, - sectorsize); + eb = alloc_extent_buffer(root->fs_info, key.objectid, sectorsize); if (!eb) return -ENOMEM; @@ -376,7 +375,8 @@ static int reiserfs_convert_tail(struct btrfs_trans_handle *trans, u64 isize; int ret; - if (length >= BTRFS_MAX_INLINE_DATA_SIZE(root->fs_info)) + if (length >= BTRFS_MAX_INLINE_DATA_SIZE(root->fs_info) || + length >= root->fs_info->sectorsize) return convert_direct(trans, root, objectid, inode, body, length, offset, convert_flags); |