udf: use ext2_find_next_bit
in [Kernel]
|
Prev: cgroups: fix failure path in cgroup_write_event_control()
Next: pm_op(): usb_dev_suspend+0x0/0x10 returns -2 on USB device 8087:0020
From: Geert Uytterhoeven on 28 Feb 2010 09:10 On Sun, Feb 28, 2010 at 11:04, Geert Uytterhoeven <geert(a)linux-m68k.org> wrote: > On Thu, Feb 25, 2010 at 15:29, Akinobu Mita <akinobu.mita(a)gmail.com> wrote: >> 2010/2/25 Geert Uytterhoeven <geert(a)linux-m68k.org>: >>> On Thu, Feb 25, 2010 at 02:38, Akinobu Mita <akinobu.mita(a)gmail.com> wrote: >>>> 2010/2/25 Jan Kara <jack(a)suse.cz>: >>>>> On Tue 23-02-10 23:11:13, Akinobu Mita wrote: >>>>>> 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. > > 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 c9b5c7e6ef2092be822778a0b6b3d3032c058f5b Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven <geert(a)linux-m68k.org> 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. Signed-off-by: Geert Uytterhoeven <geert(a)linux-m68k.org> --- arch/m68k/include/asm/bitops_mm.h | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/m68k/include/asm/bitops_mm.h b/arch/m68k/include/asm/bitops_mm.h index 9bde784..b4ecdaa 100644 --- a/arch/m68k/include/asm/bitops_mm.h +++ b/arch/m68k/include/asm/bitops_mm.h @@ -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; -- 1.6.0.4 Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert(a)linux-m68k.org 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Jan Kara on 1 Mar 2010 06:00
On Thu 25-02-10 10:38:25, Akinobu Mita wrote: > 2010/2/25 Jan Kara <jack(a)suse.cz>: > > On Tue 23-02-10 23:11:13, Akinobu Mita wrote: > >> 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 <akinobu.mita(a)gmail.com> > >> Cc: Jan Kara <jack(a)suse.cz> > > �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 that ext2_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. > 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 -- Jan Kara <jack(a)suse.cz> SUSE Labs, CR -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |