diff options
| author | Tom Rini <trini@konsulko.com> | 2023-02-23 17:30:49 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-02-23 17:30:49 -0500 |
| commit | 0b58258a33280a536c5b1e5e90dfdf0b5b5852cc (patch) | |
| tree | 418dbaf5a7f88305974186a1297ff2e9ae4c5aaa /fs/btrfs | |
| parent | 8c39999acb726ef083d3d5de12f20318ee0e5070 (diff) | |
| parent | 5b4acb0ff79df642ef6b1e35fd4b193a4dc3c62b (diff) | |
Merge branch '2023-02-23-assorted-fixes'
- btrfs bugfix, silence a bunch of gcc-12.2 linker warnings finally,
relax one of the trace test time requirements (so CI doesn't fail due
to test being slightly slow, but still correct), and correct env on
MMC and checking for where GPT can be
Diffstat (limited to 'fs/btrfs')
| -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 4aaaeab663f..7d4095d9ca8 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; |