diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-29 20:46:59 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-29 20:46:59 +0300 |
commit | fd919bbd334f22486ee2e9c16ceefe833bb9e32f (patch) | |
tree | acb3f041f72d31ba1f6165a70566c1e11fbd220c /fs/btrfs/verity.c | |
parent | 6f11521267319659cceabe073112a0e35bcb7ff8 (diff) | |
parent | ccaa66c8dd277ac02f96914168bb7177f7ea8117 (diff) | |
download | linux-fd919bbd334f22486ee2e9c16ceefe833bb9e32f.tar.xz |
Merge tag 'for-5.15-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
"Last minute fixes for crash on 32bit architectures when compression is
in use. It's a regression introduced in 5.15-rc and I'd really like
not let this into the final release, fixes via stable trees would add
unnecessary delay.
The problem is on 32bit architectures with highmem enabled, the pages
for compression may need to be kmapped, while the patches removed that
as we don't use GFP_HIGHMEM allocations anymore. The pages that don't
come from local allocation still may be from highmem. Despite being on
32bit there's enough such ARM machines in use so it's not a marginal
issue.
I did full reverts of the patches one by one instead of a huge one.
There's one exception for the "lzo" revert as there was an
intermediate patch touching the same code to make it compatible with
subpage. I can't revert that one too, so the revert in lzo.c is
manual. Qu Wenruo has worked on that with me and verified the changes"
* tag 'for-5.15-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
Revert "btrfs: compression: drop kmap/kunmap from lzo"
Revert "btrfs: compression: drop kmap/kunmap from zlib"
Revert "btrfs: compression: drop kmap/kunmap from zstd"
Revert "btrfs: compression: drop kmap/kunmap from generic helpers"
Diffstat (limited to 'fs/btrfs/verity.c')
0 files changed, 0 insertions, 0 deletions