bitmap patches for v6.9-rc1

Hi Linus,
 
 Please pull a couple random cleanups for 6.9 plus a step-down
 patch from Andy.
 
 Thanks,
 	Yury
 -----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCgAdFiEEi8GdvG6xMhdgpu/4sUSA/TofvsgFAmX7JVQACgkQsUSA/Tof
 vsj74AwAiI4uRTt1mjV8MG7v/EpmAZ7uE6MVjwXnh/eA/gLn6DcWLqUz57b/IZhW
 37TorA2l7MLhwz8J6NN33yVrR030fxI9KWs1OQTyS12mjIhmbFZ0qi6fJlYnVMUA
 5DXLY96ugHhEV5Iol1C4ByFPA/wBH5PoDiLsIiOwJyGsLJOlVi+SIRKVEeirIqfa
 Ls/fGUbUBvgP7QnHjD37QGxsrOrfmsB+SZLND+w9GkRnx2urhXKforybUiXIhk2w
 obboVNYpnWkhL+C5qGBXe5RD/UWHr6xPHwUJXtbCUZSctJDk5gZ51O1ouXjm6kxa
 kPu9nWjCfW1Hp2a+mwQ3a7ZZsjQIxysIhbxrt09fX6hMgkds53hL0Fc8VuCJibQh
 DrNzeUJz2ZN7J49I5OJd9SWnc0Cca1s3N5iv7x80S+BxhqwNfdZQ97DdlPaDzWvd
 4x/bWEi2LmU4AjN12fqQfle7xDds3QGs4w/93Z2w36YaQcqYA4sYPfRbcyD4YuUx
 7HpD6ZmY
 =DRcj
 -----END PGP SIGNATURE-----

Merge tag 'bitmap-for-6.9' of https://github.com/norov/linux

Pull bitmap updates from Yury Norov:
 "A couple of random cleanups plus a step-down patch from Andy"

* tag 'bitmap-for-6.9' of https://github.com/norov/linux:
  bitmap: Step down as a reviewer
  lib/find: optimize find_*_bit_wrap
  lib/find_bit: Fix the code comments about find_next_bit_wrap
This commit is contained in:
Linus Torvalds 2024-03-21 09:27:37 -07:00
commit 879e288692
2 changed files with 4 additions and 5 deletions

View File

@ -3598,7 +3598,6 @@ F: include/uapi/linux/bfs_fs.h
BITMAP API
M: Yury Norov <yury.norov@gmail.com>
R: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
R: Rasmus Villemoes <linux@rasmusvillemoes.dk>
S: Maintained
F: include/linux/bitfield.h

View File

@ -405,7 +405,7 @@ unsigned long find_next_and_bit_wrap(const unsigned long *addr1,
{
unsigned long bit = find_next_and_bit(addr1, addr2, size, offset);
if (bit < size)
if (bit < size || offset == 0)
return bit;
bit = find_first_and_bit(addr1, addr2, offset);
@ -413,8 +413,8 @@ unsigned long find_next_and_bit_wrap(const unsigned long *addr1,
}
/**
* find_next_bit_wrap - find the next set bit in both memory regions
* @addr: The first address to base the search on
* find_next_bit_wrap - find the next set bit in a memory region
* @addr: The address to base the search on
* @size: The bitmap size in bits
* @offset: The bitnumber to start searching at
*
@ -427,7 +427,7 @@ unsigned long find_next_bit_wrap(const unsigned long *addr,
{
unsigned long bit = find_next_bit(addr, size, offset);
if (bit < size)
if (bit < size || offset == 0)
return bit;
bit = find_first_bit(addr, offset);