udf: use ext2_find_next_bit
Subsystems (3)
PATCH 1/1 udf: use ext2_find_next_bit
Use ext2_find_next_bit (generic_find_next_le_bit) to find the set bit in little endian bitmap region.
--- fs/udf/balloc.c | 50 ++------------------------------------------------ 1 files changed, 2 insertions(+), 48 deletions(-)
fs/udf/balloc.c +2 -48
@@ -31,55 +31,9 @@#define udf_clear_bit (nr, addr) ext2_clear_bit(nr, addr)#define udf_set_bit (nr, addr) ext2_set_bit(nr, addr)#define udf_test_bit (nr, addr) ext2_test_bit(nr, addr) -#define udf_find_first_one_bit (addr, size) find_first_one_bit(addr, size) +#define udf_find_first_one_bit (addr, size) ext2_find_first_bit(addr, size)#define udf_find_next_one_bit (addr, size, offset) \ - find_next_one_bit(addr, size, offset) - -#define leBPL_to_cpup (x) leNUM_to_cpup(BITS_PER_LONG, x) -#define leNUM_to_cpup (x, y) xleNUM_to_cpup(x, y) -#define xleNUM_to_cpup (x, y) (le ## x ## _to_cpup(y)) -#define uintBPL_t uint(BITS_PER_LONG) -#define uint (x) xuint(x) -#define xuint (x) __le ## x - -static inline int find_next_one_bit (void *addr,int size,int offset) -{ -uintBPL_t *p = ((uintBPL_t *) addr) + (offset /BITS_PER_LONG ); -int result = offset & ~(BITS_PER_LONG -1 ); -unsigned long tmp; - -if (offset >= size) -return size; - size -= result; - offset &= (BITS_PER_LONG -1 ); -if (offset) { - tmp =leBPL_to_cpup (p++); - tmp &= ~0UL << offset; -if (size <BITS_PER_LONG ) - goto found_first; -if (tmp) - goto found_middle; - size -=BITS_PER_LONG ; - result +=BITS_PER_LONG ; - } -while (size & ~(BITS_PER_LONG -1 )) { - tmp =leBPL_to_cpup (p++); -if (tmp) - goto found_middle; - result +=BITS_PER_LONG ; - size -=BITS_PER_LONG ; - } -if (!size) -return result; - tmp =leBPL_to_cpup (p); -found_first: - tmp &= ~0UL >> (BITS_PER_LONG - size); -found_middle: -return result +ffz (~tmp); -} - -#define find_first_one_bit (addr, size)\ - find_next_one_bit((addr), (size), 0) + ext2_find_next_bit(addr, size, offset) static int read_block_bitmap(struct super_block *sb, struct udf_bitmap *bitmap, unsigned int block,
Signature · 1 line
1.6.0.6
Quoted 5 lines · Akinobu Mita
Use
ext2_find_next_bit(generic_find_next_le_bit) to find the set bit in little endian bitmap region.Signed-off-by Akinobu Mita <[email protected]>Cc Jan Kara <[email protected]>
I've looked at the code and I think this is wrong. UDF uses 1 for free
block in the bitmap and 0 for used one. So you need to use generic_find_next_le_bit...
Something like the patch below?
Honza
Signature · 3 lines
Jan Kara <[email protected]> SUSE Labs, CR ---
Quoted 1 line
From
bfc8c674188d4be5856e445f9b57e1b7a3dbff6dMon Sep 17 00:00:00 2001
From: Jan Kara <[email protected]>
Date: Wed, 24 Feb 2010 17:18:57 +0100
Subject: [PATCH] udf: Use generic function for bit searching
Use generic_find_next_le_bit to search for bits in bitmap so that we don't duplicate code unnecessarily.
--- fs/udf/balloc.c | 51 ++------------------------------------------------- 1 files changed, 2 insertions(+), 49 deletions(-)
fs/udf/balloc.c +2 -49
@@ -31,55 +31,8 @@#define udf_clear_bit (nr, addr) ext2_clear_bit(nr, addr)#define udf_set_bit (nr, addr) ext2_set_bit(nr, addr)#define udf_test_bit (nr, addr) ext2_test_bit(nr, addr) -#define udf_find_first_one_bit (addr, size) find_first_one_bit(addr, size)#define udf_find_next_one_bit (addr, size, offset) \ - find_next_one_bit(addr, size, offset) - -#define leBPL_to_cpup (x) leNUM_to_cpup(BITS_PER_LONG, x) -#define leNUM_to_cpup (x, y) xleNUM_to_cpup(x, y) -#define xleNUM_to_cpup (x, y) (le ## x ## _to_cpup(y)) -#define uintBPL_t uint(BITS_PER_LONG) -#define uint (x) xuint(x) -#define xuint (x) __le ## x - -static inline int find_next_one_bit (void *addr,int size,int offset) -{ -uintBPL_t *p = ((uintBPL_t *) addr) + (offset /BITS_PER_LONG ); -int result = offset & ~(BITS_PER_LONG -1 ); -unsigned long tmp; - -if (offset >= size) -return size; - size -= result; - offset &= (BITS_PER_LONG -1 ); -if (offset) { - tmp =leBPL_to_cpup (p++); - tmp &= ~0UL << offset; -if (size <BITS_PER_LONG ) - goto found_first; -if (tmp) - goto found_middle; - size -=BITS_PER_LONG ; - result +=BITS_PER_LONG ; - } -while (size & ~(BITS_PER_LONG -1 )) { - tmp =leBPL_to_cpup (p++); -if (tmp) - goto found_middle; - result +=BITS_PER_LONG ; - size -=BITS_PER_LONG ; - } -if (!size) -return result; - tmp =leBPL_to_cpup (p); -found_first: - tmp &= ~0UL >> (BITS_PER_LONG - size); -found_middle: -return result +ffz (~tmp); -} - -#define find_first_one_bit (addr, size)\ - find_next_one_bit((addr), (size), 0) + generic_find_next_le_bit((unsigned long *)addr, size, offset) static int read_block_bitmap(struct super_block *sb, struct udf_bitmap *bitmap, unsigned int block,
@@ -356,7 +309,7 @@ repeat:break ; } }else { - bit =udf_find_next_one_bit ((char *)bh->b_data, + bit =udf_find_next_one_bit (bh->b_data, sb->s_blocksize <<3 , group_start <<3 );if (bit < sb->s_blocksize <<3 )
Signature · 1 line
1.6.4.2
2010/2/25 Jan Kara <[email protected]>:
Quoted 10 lines · Akinobu Mita
Quoted 5 lines
Use
ext2_find_next_bit(generic_find_next_le_bit) to find the set bit in little endian bitmap region.Signed-off-by Akinobu Mita <[email protected]>Cc Jan Kara <[email protected]>I've looked at the code and I think this is wrong. UDF uses 1 for free block in the bitmap and 0 for used one. So you need to use
generic_find_next_le_bit...
Something like the patch below?
According to include/asm-generic/bitops/ext2-non-atomic.h, generic_find_next_le_bit() == ext2_find_next_bit().
So, is there any difference between my patch and yours? Or am I missing something?
BTW, I realized that udf_find_first_one_bit() macro is not used. So you can remove it in this patch.
Quoted 94 lines
Honza
--
Jan Kara <[email protected]>
SUSE Labs, CR
---From
bfc8c674188d4be5856e445f9b57e1b7a3dbff6dMon Sep 17 00:00:00 2001
From: Jan Kara <[email protected]>
Date: Wed, 24 Feb 2010 17:18:57 +0100
Subject: [PATCH] udf: Use generic function for bit searchingUse
generic_find_next_le_bitto search for bits in bitmap so that we don't duplicate code unnecessarily.Signed-off-by Jan Kara <[email protected]>---
fs/udf/balloc.c | 51 ++-------------------------------------------------1 files changed, 2 insertions(+), 49 deletions(-)fs/udf/balloc.c +2
-50@@ -31,55 +31,8 @@ #define udf_clear_bit(nr, addr) ext2_clear_bit(nr, addr) #define udf_set_bit(nr, addr) ext2_set_bit(nr, addr) #define udf_test_bit(nr, addr) ext2_test_bit(nr, addr) -#define udf_find_first_one_bit (addr, size) find_first_one_bit(addr, size) #define udf_find_next_one_bit(addr, size, offset) \ - find_next_one_bit(addr, size, offset) - -#define leBPL_to_cpup (x) leNUM_to_cpup(BITS_PER_LONG, x) -#define leNUM_to_cpup (x, y) xleNUM_to_cpup(x, y) -#define xleNUM_to_cpup (x, y) (le ## x ## _to_cpup(y)) -#define uintBPL_t uint(BITS_PER_LONG) -#define uint (x) xuint(x) -#define xuint (x) __le ## x - -static inline int find_next_one_bit (void *addr,int size,int offset) -{ - uintBPL_t *p = ((uintBPL_t *) addr) + (offset / BITS_PER_LONG); - int result = offset & ~(BITS_PER_LONG - 1); - unsigned long tmp; - - if (offset >= size) - return size; - size -= result; - offset &= (BITS_PER_LONG - 1); - if (offset) { - tmp = leBPL_to_cpup(p++); - tmp &= ~0UL << offset; - if (size < BITS_PER_LONG) - goto found_first; - if (tmp) - goto found_middle; - size -= BITS_PER_LONG; - result += BITS_PER_LONG; - } - while (size & ~(BITS_PER_LONG - 1)) { - tmp = leBPL_to_cpup(p++); - if (tmp) - goto found_middle; - result += BITS_PER_LONG; - size -= BITS_PER_LONG; - } - if (!size) - return result; - tmp = leBPL_to_cpup(p); -found_first: - tmp &= ~0UL >> (BITS_PER_LONG - size); -found_middle: - return result + ffz(~tmp); -} - -#define find_first_one_bit (addr, size)\ - find_next_one_bit((addr), (size), 0) + generic_find_next_le_bit((unsigned long *)addr, size, offset) static int read_block_bitmap(struct super_block *sb, struct udf_bitmap *bitmap, unsigned int block,@@ -356,7 +309,7 @@ repeat: break; } } else { - bit = udf_find_next_one_bit((char *)bh->b_data, + bit = udf_find_next_one_bit(bh->b_data, sb->s_blocksize << 3, group_start << 3); if (bit < sb->s_blocksize << 3) --1.6.4.2
Geert Uytterhoeven
maintainerQuoted 4 lines · Akinobu Mita
2010/2/25 Jan Kara <[email protected]>:
Quoted 3 lines · Akinobu Mita
Quoted 2 lines
Use
ext2_find_next_bit(generic_find_next_le_bit) to find the set bit in little endian bitmap region.
Is any of this in linux-next now?
http://kisskb.ellerman.id.au/kisskb/buildresult/2208481/
| fs/udf/balloc.c:274: error: implicit declaration of function 'generic_find_next_le_bit'
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
2010/2/25 Geert Uytterhoeven <[email protected]>:
Quoted 11 lines · Akinobu Mita
Quoted 4 lines
2010/2/25 Jan Kara <[email protected]>:
Quoted 3 lines · Akinobu Mita
Quoted 2 lines
Use
ext2_find_next_bit(generic_find_next_le_bit) to find the set bit in little endian bitmap region.Is any of this in linux-next now?
http://kisskb.ellerman.id.au/kisskb/buildresult/2208481/
|fs/udf/balloc.c:274: error: implicit declaration of function 'generic_find_next_le_bit'
Yep, Jan's patch caused the build breakage.
Because generic_find_next_le_bit() is not available for all archtectures. So we should use ext2_find_next_bit() here.
Geert Uytterhoeven
maintainerQuoted 9 lines · Akinobu Mita
2010/2/25 Geert Uytterhoeven <[email protected]>:
Quoted 8 lines · Akinobu Mita
Quoted 4 lines
2010/2/25 Jan Kara <[email protected]>:
Quoted 3 lines · Akinobu Mita
Quoted 2 lines
Use
ext2_find_next_bit(generic_find_next_le_bit) to find the set bit in little endian bitmap region.Is any of this in linux-next now?
Quoted 8 lines
Quoted 3 lines
http://kisskb.ellerman.id.au/kisskb/buildresult/2208481/
|fs/udf/balloc.c:274: error: implicit declaration of function 'generic_find_next_le_bit'Yep, Jan's patch caused the build breakage.
Because
generic_find_next_le_bit()is not available for all archtectures. So we should useext2_find_next_bit()here.
Most architectures use the definitions in asm-generic, so they're OK. M68k doesn't. S390 is also affected, and I think arm as well (but there's no arm all-modconfig build in linux-next, so I'm not 100% sure).
I'm cooking a patch...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Geert Uytterhoeven
maintainerQuoted 19 lines · Geert Uytterhoeven
Quoted 9 lines · Akinobu Mita
2010/2/25 Geert Uytterhoeven <[email protected]>:
Quoted 8 lines · Akinobu Mita
Quoted 4 lines
2010/2/25 Jan Kara <[email protected]>:
Quoted 3 lines · Akinobu Mita
Quoted 2 lines
Use
ext2_find_next_bit(generic_find_next_le_bit) to find the set bit in little endian bitmap region.Is any of this in linux-next now?
Quoted 8 lines
Quoted 3 lines
http://kisskb.ellerman.id.au/kisskb/buildresult/2208481/
|fs/udf/balloc.c:274: error: implicit declaration of function 'generic_find_next_le_bit'Yep, Jan's patch caused the build breakage.
Because
generic_find_next_le_bit()is not available for all archtectures. So we should useext2_find_next_bit()here.
Quoted 7 lines
Most architectures use the definitions in asm-generic, so they're OK. M68k doesn't. S390 is also affected, and I think arm as well (but there's no arm all-modconfig build in linux-next, so I'm not 100% sure).
I'm cooking a patch...
From
c9b5c7e6ef2092be822778a0b6b3d3032c058f5bMon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <[email protected]>
Date: Sun, 28 Feb 2010 13:06:27 +0100
Subject: [PATCH] m68k: Implement generic_find_next_{zero_,}le_bit()
linux-next:fs/udf/balloc.c: In function 'udf_bitmap_new_block':fs/udf/balloc.c:274: error: implicit declaration of function 'generic_find_next_le_bit'
Convert ext2_find_next_{zero_,}bit() into generic_find_next_{zero_,}le_bit(), and wrap the ext2_find_next_{zero_,}bit() around the latter.
--- arch/m68k/include/asm/bitops_mm.h | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-)
(quoted diff) +0 -0
b/arch/m68k/include/asm/bitops_mm.h
index 9bde784..b4ecdaa 100644
arch/m68k/include/asm/bitops_mm.h +0 -0
@@ -365,6 +365,10 @@ static inline int minix_test_bit(int nr, const void *vaddr)#define ext2_set_bit_atomic (lock, nr, addr) test_and_set_bit((nr) ^
24, (unsigned long *)(addr))
#define ext2_clear_bit(nr, addr) __test_and_clear_bit((nr) ^ 24,
(unsigned long *)(addr))
#define ext2_clear_bit_atomic(lock, nr, addr) test_and_clear_bit((nr)
^ 24, (unsigned long *)(addr))
+#define ext2_find_next_zero_bit(addr, size, offset) \
+ generic_find_next_zero_le_bit((unsigned long *)addr, size, offset)
+#define ext2_find_next_bit(addr, size, offset) \
+ generic_find_next_le_bit((unsigned long *)addr, size, offset)
static inline int ext2_test_bit(int nr, const void *vaddr) {
@@ -394,10 +398,9 @@ static inline int ext2_find_first_zero_bit(const void *vaddr, unsigned size)
return (p - addr) * 32 + res;
}
-static inline int ext2_find_next_zero_bit(const void *vaddr, unsigned size,
- unsigned offset)
+static inline unsigned long generic_find_next_zero_le_bit(const unsigned long *addr,
+ unsigned long size, unsigned long offset)
{
- const unsigned long *addr = vaddr;
const unsigned long *p = addr + (offset >> 5);
int bit = offset & 31UL, res;
@@ -437,10 +440,9 @@ static inline int ext2_find_first_bit(const void *vaddr, unsigned size)
return (p - addr) * 32 + res;
}
-static inline int ext2_find_next_bit(const void *vaddr, unsigned size,
- unsigned offset)
+static inline unsigned long generic_find_next_le_bit(const unsigned long *addr,
+ unsigned long size, unsigned long offset)
{
- const unsigned long *addr = vaddr;
const unsigned long *p = addr + (offset >> 5);
int bit = offset & 31UL, res;
Signature · 12 lines
1.6.0.4
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus TorvaldsGeert Uytterhoeven
maintainerQuoted 19 lines · Geert Uytterhoeven
Quoted 9 lines · Akinobu Mita
2010/2/25 Geert Uytterhoeven <[email protected]>:
Quoted 8 lines · Akinobu Mita
Quoted 4 lines
2010/2/25 Jan Kara <[email protected]>:
Quoted 3 lines · Akinobu Mita
Quoted 2 lines
Use
ext2_find_next_bit(generic_find_next_le_bit) to find the set bit in little endian bitmap region.Is any of this in linux-next now?
Quoted 8 lines
Quoted 3 lines
http://kisskb.ellerman.id.au/kisskb/buildresult/2208481/
|fs/udf/balloc.c:274: error: implicit declaration of function 'generic_find_next_le_bit'Yep, Jan's patch caused the build breakage.
Because
generic_find_next_le_bit()is not available for all archtectures. So we should useext2_find_next_bit()here.
Quoted 7 lines
Most architectures use the definitions in asm-generic, so they're OK. M68k doesn't. S390 is also affected, and I think arm as well (but there's no arm all-modconfig build in linux-next, so I'm not 100% sure).
I'm cooking a patch...
From
c9b5c7e6ef2092be822778a0b6b3d3032c058f5bMon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <[email protected]>
Date: Sun, 28 Feb 2010 13:06:27 +0100
Subject: [PATCH] m68k: Implement generic_find_next_{zero_,}le_bit()
linux-next:fs/udf/balloc.c: In function 'udf_bitmap_new_block':fs/udf/balloc.c:274: error: implicit declaration of function 'generic_find_next_le_bit'
Convert ext2_find_next_{zero_,}bit() into generic_find_next_{zero_,}le_bit(), and wrap the ext2_find_next_{zero_,}bit() around the latter.
--- arch/m68k/include/asm/bitops_mm.h | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-)
(quoted diff) +0 -0
b/arch/m68k/include/asm/bitops_mm.h
index 9bde784..b4ecdaa 100644
arch/m68k/include/asm/bitops_mm.h +0 -0
@@ -365,6 +365,10 @@ static inline int minix_test_bit(int nr, const void *vaddr)#define ext2_set_bit_atomic (lock, nr, addr) test_and_set_bit((nr) ^
24, (unsigned long *)(addr))
#define ext2_clear_bit(nr, addr) __test_and_clear_bit((nr) ^ 24,
(unsigned long *)(addr))
#define ext2_clear_bit_atomic(lock, nr, addr) test_and_clear_bit((nr)
^ 24, (unsigned long *)(addr))
+#define ext2_find_next_zero_bit(addr, size, offset) \
+ generic_find_next_zero_le_bit((unsigned long *)addr, size, offset)
+#define ext2_find_next_bit(addr, size, offset) \
+ generic_find_next_le_bit((unsigned long *)addr, size, offset)
static inline int ext2_test_bit(int nr, const void *vaddr) {
@@ -394,10 +398,9 @@ static inline int ext2_find_first_zero_bit(const void *vaddr, unsigned size)
return (p - addr) * 32 + res;
}
-static inline int ext2_find_next_zero_bit(const void *vaddr, unsigned size,
- unsigned offset)
+static inline unsigned long generic_find_next_zero_le_bit(const unsigned long *addr,
+ unsigned long size, unsigned long offset)
{
- const unsigned long *addr = vaddr;
const unsigned long *p = addr + (offset >> 5);
int bit = offset & 31UL, res;
@@ -437,10 +440,9 @@ static inline int ext2_find_first_bit(const void *vaddr, unsigned size)
return (p - addr) * 32 + res;
}
-static inline int ext2_find_next_bit(const void *vaddr, unsigned size,
- unsigned offset)
+static inline unsigned long generic_find_next_le_bit(const unsigned long *addr,
+ unsigned long size, unsigned long offset)
{
- const unsigned long *addr = vaddr;
const unsigned long *p = addr + (offset >> 5);
int bit = offset & 31UL, res;
Signature · 12 lines
1.6.0.4
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus TorvaldsQuoted 31 lines · Geert Uytterhoeven
Quoted 16 lines · Geert Uytterhoeven
Quoted 15 lines · Akinobu Mita
2010/2/25 Geert Uytterhoeven <[email protected]>:
Quoted 11 lines · Akinobu Mita
Quoted 4 lines
2010/2/25 Jan Kara <[email protected]>:
Quoted 3 lines · Akinobu Mita
Quoted 2 lines
Use
ext2_find_next_bit(generic_find_next_le_bit) to find the set bit in little endian bitmap region.Is any of this in linux-next now?
http://kisskb.ellerman.id.au/kisskb/buildresult/2208481/
|fs/udf/balloc.c:274: error: implicit declaration of function 'generic_find_next_le_bit'Yep, Jan's patch caused the build breakage.
Quoted 8 lines
Quoted 2 lines
Because
generic_find_next_le_bit()is not available for all archtectures. So we should useext2_find_next_bit()here.Most architectures use the definitions in asm-generic, so they're OK. M68k doesn't. S390 is also affected, and I think arm as well (but there's no arm all-modconfig build in linux-next, so I'm not 100% sure).
I'm cooking a patch...
From
c9b5c7e6ef2092be822778a0b6b3d3032c058f5bMon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <[email protected]>
Date: Sun, 28 Feb 2010 13:06:27 +0100
Subject: [PATCH] m68k: Implement generic_find_next_{zero_,}le_bit()
Quoted 7 lines
linux-next:
fs/udf/balloc.c: In function 'udf_bitmap_new_block':fs/udf/balloc.c:274: error: implicit declaration of function 'generic_find_next_le_bit'Convert ext2_find_next_{zero_,}bit() into generic_find_next_{zero_,}le_bit(), and wrap the ext2_find_next_{zero_,}bit() around the latter.
I've now used Akinobu's patch so yours isn't really needed but it's a
good cleanup anyway in my opinion.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 7 lines · Akinobu Mita
2010/2/25 Jan Kara <[email protected]>:
Quoted 6 lines · Akinobu Mita
Quoted 5 lines
Use
ext2_find_next_bit(generic_find_next_le_bit) to find the set bit in little endian bitmap region.Signed-off-by Akinobu Mita <[email protected]>Cc Jan Kara <[email protected]>
Quoted 7 lines
Quoted 4 lines
I've looked at the code and I think this is wrong. UDF uses 1 for free block in the bitmap and 0 for used one. So you need to use
generic_find_next_le_bit...
Something like the patch below?According to
include/asm-generic/bitops/ext2-non-atomic.h,generic_find_next_le_bit()==ext2_find_next_bit().
Ah, I'm really sorry. I've originally misread the header and thought thatext2_find_next_bit == generic_find_next_le_zero_bit. So my patch does exactly the same thing as yours. I've now merged your patch so that you get proper credit.
Quoted 2 lines
BTW, I realized that
udf_find_first_one_bit()macro is not used. So you can remove it in this patch.
Yes, I've removed it now.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR