diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-01 07:31:47 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-01 07:31:47 -1000 |
| commit | 6b4926494ed872803bb0b3c59440ac25c35c9869 (patch) | |
| tree | 6cea49601ff5eee2973b7cc716385d1da07530d6 /arch | |
| parent | 7b83601da470cfdb0a66eb9335fb6ec34d3dd876 (diff) | |
| parent | 77b0d113eec49a7390ff1a08ca1923e89f5f86c6 (diff) | |
Merge tag 'for-6.12-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
"A few more stability fixes. There's one patch adding export of MIPS
cmpxchg helper, used in the error propagation fix.
- fix error propagation from split bios to the original btrfs bio
- fix merging of adjacent extents (normal operation, defragmentation)
- fix potential use after free after freeing btrfs device structures"
* tag 'for-6.12-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: fix defrag not merging contiguous extents due to merged extent maps
btrfs: fix extent map merging not happening for adjacent extents
btrfs: fix use-after-free of block device file in __btrfs_free_extra_devids()
btrfs: fix error propagation of split bios
MIPS: export __cmpxchg_small()
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/kernel/cmpxchg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/cmpxchg.c b/arch/mips/kernel/cmpxchg.c index e974a4954df8..c371def2302d 100644 --- a/arch/mips/kernel/cmpxchg.c +++ b/arch/mips/kernel/cmpxchg.c @@ -102,3 +102,4 @@ unsigned long __cmpxchg_small(volatile void *ptr, unsigned long old, return old; } } +EXPORT_SYMBOL(__cmpxchg_small); |