diff options
| author | Tom Rini <trini@konsulko.com> | 2023-02-28 01:28:21 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-02-28 01:28:21 +0300 |
| commit | 5b197eee334bdf75cc9e9148161299679a5251ea (patch) | |
| tree | edec3c21a01fb54d764d04caa2bd774823e76c2d /fs/btrfs/volumes.c | |
| parent | 7a826ded4a0e409d73ff4a910685821d34f1b664 (diff) | |
| parent | e8c80ac0f7a13bf0fc016ce324b870c0cff7a2b8 (diff) | |
| download | u-boot-5b197eee334bdf75cc9e9148161299679a5251ea.tar.xz | |
Merge tag 'v2023.04-rc3' into next
Prepare v2023.04-rc3
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 4aaaeab663..7d4095d9ca 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -956,6 +956,7 @@ int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, struct btrfs_mapping_tree *map_tree = &fs_info->mapping_tree; struct cache_extent *ce; struct map_lookup *map; + u64 orig_len = *length; u64 offset; u64 stripe_offset; u64 *raid_map = NULL; @@ -1047,6 +1048,7 @@ again: } else { *length = ce->size - offset; } + *length = min_t(u64, *length, orig_len); if (!multi_ret) goto out; |