github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 10:09:10 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

bcachefs hotfixes for 6.14-rc7

Browse Source 
- change an assertion to an ERO that a user hit doing the 6.14 upgrade
 - fix 32 bit build breakage
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEKnAFLkS8Qha+jvQrE6szbY3KbnYFAmfUw1UACgkQE6szbY3K
 bnY+WQ//QZ4gs78eipqCa3cpmYsjMFaNsBh+s+DbX5vYU1mrRwPMRfrsXEN26fjx
 G5eVFdCix/0rFuLWHpJzehQxMWeicpgP7WLN6WM/eKSIkZWlyR7xQj+xzGRSmMWp
 3ZIb4qh3XzJvJyl3aXD0VW5P5a4+HEWTDdsmFivPtCmPg1yrLPZrdoc0siIJsXMD
 ZGRrH2ngapVYbCRIQ3+jemEwJ2NeA6/kaP64J9DhVi4w24OjBFhheJ4DFTpntgQj
 onE0tWTr762rQXE0zkoPDMJ7ESu8Uag7AISU6bwO4ZJP+oH7o+Ws40LYY326c+Ng
 jWnjjDD2AGFTMEA35sf9mTUVyyZVaGWJ5eYm2hzt0JkUhW3j/rserGCPmMqwo4k8
 NSaIAA1BgfUBXokY996VafygX6AhDjuEYIT3umeAH3avifejrKeNfmMwSQWyZF2w
 Pe2teHftbyflsbplUg27bPLaiiRD2mQKMopBXl5j2zjy0/YWAjoloMF21JWwotjQ
 f1YFzjaO6CrIoRfFWB/RQXKKRS0hUaTccLdw9q6KfWT3GPKdpYEZNngo6NWd74fm
 XIGUNgKBbdPKUCBXEoaFsrZ1D8Hr39oBTtoMrvADb/RV9q0RDBBaCmZzdlfbcNoO
 ka78Z297nJl98tXE44njxWItO11Syn+3f2xt33KnySKyng7kXsw=
 =dNgK
 -----END PGP SIGNATURE-----

Merge tag 'bcachefs-2025-03-14.2' of git://evilpiepirate.org/bcachefs

Pull another bcachefs hotfix from Kent Overstreet:

 - fix 32 bit build breakage

* tag 'bcachefs-2025-03-14.2' of git://evilpiepirate.org/bcachefs:
  bcachefs: fix build on 32 bit in get_random_u64_below()
This commit is contained in:
Linus Torvalds 2025-03-14 14:17:37 -10:00
commit 85ac31fecb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/bcachefs/util.c
View File

@ -663,7 +663,8 @@ u64 bch2_get_random_u64_below(u64 ceil)
u64 mult = ceil * rand;
if (unlikely(mult < ceil)) {
u64 bound = -ceil % ceil;
u64 bound;
div64_u64_rem(-ceil, ceil, &bound);
while (unlikely(mult < bound)) {
rand = get_random_u64();
mult = ceil * rand;