redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

bitops: remove ext2 non-atomic bitops from asm/bitops.h

Browse source 
As the result of conversions, there are no users of ext2 non-atomic bit
operations except for ext2 filesystem itself.  Now we can put them into
architecture independent code in ext2 filesystem, and remove from
asm/bitops.h for all architectures.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Akinobu Mita 2011-03-23 16:42:14 -07:00 committed by Linus Torvalds
parent bb5cda3d70
commit f312eff816
25 changed files with 6 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/alpha/include/asm/bitops.h
View file

@ -455,7 +455,6 @@ sched_find_first_bit(const unsigned long b[2])
} }
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-non-atomic.h>
#define ext2_set_bit_atomic(l,n,a) test_and_set_bit(n,a) #define ext2_set_bit_atomic(l,n,a) test_and_set_bit(n,a)
#define ext2_clear_bit_atomic(l,n,a) test_and_clear_bit(n,a) #define ext2_clear_bit_atomic(l,n,a) test_and_clear_bit(n,a)

7
arch/arm/include/asm/bitops.h
View file

@ -339,18 +339,11 @@ static inline int find_next_bit_le(const void *p, int size, int offset)
/* /*
* Ext2 is defined to use little-endian byte ordering. * Ext2 is defined to use little-endian byte ordering.
* These do not need to be atomic.
*/ */
#define ext2_set_bit __test_and_set_bit_le
#define ext2_set_bit_atomic(lock, nr, p) \ #define ext2_set_bit_atomic(lock, nr, p) \
test_and_set_bit_le(nr, p) test_and_set_bit_le(nr, p)
#define ext2_clear_bit __test_and_clear_bit_le
#define ext2_clear_bit_atomic(lock, nr, p) \ #define ext2_clear_bit_atomic(lock, nr, p) \
test_and_clear_bit_le(nr, p) test_and_clear_bit_le(nr, p)
#define ext2_test_bit test_bit_le
#define ext2_find_first_zero_bit find_first_zero_bit_le
#define ext2_find_next_zero_bit find_next_zero_bit_le
#define ext2_find_next_bit find_next_bit_le
/* /*
* Minix is defined to use little-endian byte ordering. * Minix is defined to use little-endian byte ordering.

1
arch/avr32/include/asm/bitops.h
View file

@ -300,7 +300,6 @@ static inline int ffs(unsigned long word)
#include <asm-generic/bitops/lock.h> #include <asm-generic/bitops/lock.h>
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-non-atomic.h>
#include <asm-generic/bitops/ext2-atomic.h> #include <asm-generic/bitops/ext2-atomic.h>
#include <asm-generic/bitops/minix-le.h> #include <asm-generic/bitops/minix-le.h>

1
arch/blackfin/include/asm/bitops.h
View file

@ -26,7 +26,6 @@
#include <asm-generic/bitops/lock.h> #include <asm-generic/bitops/lock.h>
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-non-atomic.h>
#include <asm-generic/bitops/ext2-atomic.h> #include <asm-generic/bitops/ext2-atomic.h>
#include <asm-generic/bitops/minix.h> #include <asm-generic/bitops/minix.h>

1
arch/cris/include/asm/bitops.h
View file

@ -155,7 +155,6 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr)
#include <asm-generic/bitops/lock.h> #include <asm-generic/bitops/lock.h>
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-non-atomic.h>
#define ext2_set_bit_atomic(l,n,a) test_and_set_bit(n,a) #define ext2_set_bit_atomic(l,n,a) test_and_set_bit(n,a)
#define ext2_clear_bit_atomic(l,n,a) test_and_clear_bit(n,a) #define ext2_clear_bit_atomic(l,n,a) test_and_clear_bit(n,a)

1
arch/frv/include/asm/bitops.h
View file

@ -402,7 +402,6 @@ int __ilog2_u64(u64 n)
#include <asm-generic/bitops/lock.h> #include <asm-generic/bitops/lock.h>
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-non-atomic.h>
#define ext2_set_bit_atomic(lock,nr,addr) test_and_set_bit ((nr) ^ 0x18, (addr)) #define ext2_set_bit_atomic(lock,nr,addr) test_and_set_bit ((nr) ^ 0x18, (addr))
#define ext2_clear_bit_atomic(lock,nr,addr) test_and_clear_bit((nr) ^ 0x18, (addr)) #define ext2_clear_bit_atomic(lock,nr,addr) test_and_clear_bit((nr) ^ 0x18, (addr))

1
arch/h8300/include/asm/bitops.h
View file

@ -201,7 +201,6 @@ static __inline__ unsigned long __ffs(unsigned long word)
#include <asm-generic/bitops/hweight.h> #include <asm-generic/bitops/hweight.h>
#include <asm-generic/bitops/lock.h> #include <asm-generic/bitops/lock.h>
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-non-atomic.h>
#include <asm-generic/bitops/ext2-atomic.h> #include <asm-generic/bitops/ext2-atomic.h>
#include <asm-generic/bitops/minix.h> #include <asm-generic/bitops/minix.h>

1
arch/ia64/include/asm/bitops.h
View file

@ -457,7 +457,6 @@ static __inline__ unsigned long __arch_hweight64(unsigned long x)
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-non-atomic.h>
#define ext2_set_bit_atomic(l,n,a) test_and_set_bit(n,a) #define ext2_set_bit_atomic(l,n,a) test_and_set_bit(n,a)
#define ext2_clear_bit_atomic(l,n,a) test_and_clear_bit(n,a) #define ext2_clear_bit_atomic(l,n,a) test_and_clear_bit(n,a)

1
arch/m32r/include/asm/bitops.h
View file

@ -267,7 +267,6 @@ static __inline__ int test_and_change_bit(int nr, volatile void * addr)
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-non-atomic.h>
#include <asm-generic/bitops/ext2-atomic.h> #include <asm-generic/bitops/ext2-atomic.h>
#include <asm-generic/bitops/minix.h> #include <asm-generic/bitops/minix.h>

7
arch/m68k/include/asm/bitops_mm.h
View file

@ -490,17 +490,10 @@ static inline unsigned long find_next_bit_le(const void *addr,
/* Bitmap functions for the ext2 filesystem. */ /* Bitmap functions for the ext2 filesystem. */
#define ext2_set_bit __test_and_set_bit_le
#define ext2_set_bit_atomic(lock, nr, addr) \ #define ext2_set_bit_atomic(lock, nr, addr) \
test_and_set_bit_le(nr, addr) test_and_set_bit_le(nr, addr)
#define ext2_clear_bit __test_and_clear_bit_le
#define ext2_clear_bit_atomic(lock, nr, addr) \ #define ext2_clear_bit_atomic(lock, nr, addr) \
test_and_clear_bit_le(nr, addr) test_and_clear_bit_le(nr, addr)
#define ext2_find_next_zero_bit find_next_zero_bit_le
#define ext2_find_next_bit find_next_bit_le
#define ext2_test_bit test_bit_le
#define ext2_find_first_zero_bit find_first_zero_bit_le
#define ext2_find_first_bit find_first_bit_le
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

7
arch/m68k/include/asm/bitops_no.h
View file

@ -336,13 +336,6 @@ found_middle:
return result + ffz(__swab32(tmp)); return result + ffz(__swab32(tmp));
} }
#define ext2_set_bit __test_and_set_bit_le
#define ext2_clear_bit __test_and_clear_bit_le
#define ext2_test_bit test_bit_le
#define ext2_find_first_zero_bit find_first_zero_bit_le
#define ext2_find_next_zero_bit find_next_zero_bit_le
#define ext2_find_next_bit find_next_bit_le
#include <asm-generic/bitops/minix.h> #include <asm-generic/bitops/minix.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

1
arch/mips/include/asm/bitops.h
View file

@ -677,7 +677,6 @@ static inline int ffs(int word)
#include <asm-generic/bitops/const_hweight.h> #include <asm-generic/bitops/const_hweight.h>
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-non-atomic.h>
#include <asm-generic/bitops/ext2-atomic.h> #include <asm-generic/bitops/ext2-atomic.h>
#include <asm-generic/bitops/minix.h> #include <asm-generic/bitops/minix.h>

1
arch/mn10300/include/asm/bitops.h
View file

@ -234,7 +234,6 @@ int ffs(int x)
test_and_clear_bit((nr), (addr)) test_and_clear_bit((nr), (addr))
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-non-atomic.h>
#include <asm-generic/bitops/minix-le.h> #include <asm-generic/bitops/minix-le.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

1
arch/parisc/include/asm/bitops.h
View file

@ -223,7 +223,6 @@ static __inline__ int fls(int x)
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-non-atomic.h>
/* '3' is bits per byte */ /* '3' is bits per byte */
#define LE_BYTE_ADDR ((sizeof(unsigned long) - 1) << 3) #define LE_BYTE_ADDR ((sizeof(unsigned long) - 1) << 3)

14
arch/powerpc/include/asm/bitops.h
View file

@ -327,25 +327,11 @@ unsigned long find_next_bit_le(const void *addr,
unsigned long size, unsigned long offset); unsigned long size, unsigned long offset);
/* Bitmap functions for the ext2 filesystem */ /* Bitmap functions for the ext2 filesystem */
#define ext2_set_bit(nr,addr) \
__test_and_set_bit_le((nr), (unsigned long*)addr)
#define ext2_clear_bit(nr, addr) \
__test_and_clear_bit_le((nr), (unsigned long*)addr)
#define ext2_set_bit_atomic(lock, nr, addr) \ #define ext2_set_bit_atomic(lock, nr, addr) \
test_and_set_bit_le((nr), (unsigned long*)addr) test_and_set_bit_le((nr), (unsigned long*)addr)
#define ext2_clear_bit_atomic(lock, nr, addr) \ #define ext2_clear_bit_atomic(lock, nr, addr) \
test_and_clear_bit_le((nr), (unsigned long*)addr) test_and_clear_bit_le((nr), (unsigned long*)addr)
#define ext2_test_bit(nr, addr) test_bit_le((nr),(unsigned long*)addr)
#define ext2_find_first_zero_bit(addr, size) \
find_first_zero_bit_le((unsigned long*)addr, size)
#define ext2_find_next_zero_bit(addr, size, off) \
find_next_zero_bit_le((unsigned long *)addr, size, off)
#define ext2_find_next_bit(addr, size, off) \
find_next_bit_le((unsigned long *)addr, size, off)
/* Bitmap functions for the minix filesystem. */ /* Bitmap functions for the minix filesystem. */
#define minix_test_and_set_bit(nr,addr) \ #define minix_test_and_set_bit(nr,addr) \

7
arch/s390/include/asm/bitops.h
View file

@ -857,17 +857,10 @@ static inline int find_next_bit_le(void *vaddr, unsigned long size,
return offset + find_first_bit_le(p, size); return offset + find_first_bit_le(p, size);
} }
#define ext2_set_bit __test_and_set_bit_le
#define ext2_set_bit_atomic(lock, nr, addr) \ #define ext2_set_bit_atomic(lock, nr, addr) \
test_and_set_bit_le(nr, addr) test_and_set_bit_le(nr, addr)
#define ext2_clear_bit __test_and_clear_bit_le
#define ext2_clear_bit_atomic(lock, nr, addr) \ #define ext2_clear_bit_atomic(lock, nr, addr) \
test_and_clear_bit_le(nr, addr) test_and_clear_bit_le(nr, addr)
#define ext2_test_bit test_bit_le
#define ext2_find_first_zero_bit find_first_zero_bit_le
#define ext2_find_next_zero_bit find_next_zero_bit_le
#define ext2_find_first_bit find_first_bit_le
#define ext2_find_next_bit find_next_bit_le
#include <asm-generic/bitops/minix.h> #include <asm-generic/bitops/minix.h>

1
arch/sh/include/asm/bitops.h
View file

@ -95,7 +95,6 @@ static inline unsigned long ffz(unsigned long word)
#include <asm-generic/bitops/lock.h> #include <asm-generic/bitops/lock.h>
#include <asm-generic/bitops/sched.h> #include <asm-generic/bitops/sched.h>
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-non-atomic.h>
#include <asm-generic/bitops/ext2-atomic.h> #include <asm-generic/bitops/ext2-atomic.h>
#include <asm-generic/bitops/minix.h> #include <asm-generic/bitops/minix.h>
#include <asm-generic/bitops/fls.h> #include <asm-generic/bitops/fls.h>

1
arch/sparc/include/asm/bitops_32.h
View file

@ -104,7 +104,6 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr)
#include <asm-generic/bitops/lock.h> #include <asm-generic/bitops/lock.h>
#include <asm-generic/bitops/find.h> #include <asm-generic/bitops/find.h>
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-non-atomic.h>
#include <asm-generic/bitops/ext2-atomic.h> #include <asm-generic/bitops/ext2-atomic.h>
#include <asm-generic/bitops/minix.h> #include <asm-generic/bitops/minix.h>

1
arch/sparc/include/asm/bitops_64.h
View file

@ -90,7 +90,6 @@ static inline unsigned int __arch_hweight8(unsigned int w)
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-non-atomic.h>
#define ext2_set_bit_atomic(lock,nr,addr) \ #define ext2_set_bit_atomic(lock,nr,addr) \
test_and_set_bit((nr) ^ 0x38,(unsigned long *)(addr)) test_and_set_bit((nr) ^ 0x38,(unsigned long *)(addr))

1
arch/tile/include/asm/bitops.h
View file

@ -123,7 +123,6 @@ static inline unsigned long __arch_hweight64(__u64 w)
#include <asm-generic/bitops/find.h> #include <asm-generic/bitops/find.h>
#include <asm-generic/bitops/sched.h> #include <asm-generic/bitops/sched.h>
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-non-atomic.h>
#include <asm-generic/bitops/minix.h> #include <asm-generic/bitops/minix.h>
#endif /* _ASM_TILE_BITOPS_H */ #endif /* _ASM_TILE_BITOPS_H */

1
arch/x86/include/asm/bitops.h
View file

@ -457,7 +457,6 @@ static inline int fls(int x)
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-non-atomic.h>
#define ext2_set_bit_atomic(lock, nr, addr) \ #define ext2_set_bit_atomic(lock, nr, addr) \
test_and_set_bit((nr), (unsigned long *)(addr)) test_and_set_bit((nr), (unsigned long *)(addr))

1
arch/xtensa/include/asm/bitops.h
View file

@ -107,7 +107,6 @@ static inline unsigned long __fls(unsigned long word)
#include <asm-generic/bitops/fls64.h> #include <asm-generic/bitops/fls64.h>
#include <asm-generic/bitops/find.h> #include <asm-generic/bitops/find.h>
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-non-atomic.h>
#ifdef __XTENSA_EL__ #ifdef __XTENSA_EL__
# define ext2_set_bit_atomic(lock,nr,addr) \ # define ext2_set_bit_atomic(lock,nr,addr) \

6
fs/ext2/ext2.h
View file

@ -174,3 +174,9 @@ ext2_group_first_block_no(struct super_block *sb, unsigned long group_no)
return group_no * (ext2_fsblk_t)EXT2_BLOCKS_PER_GROUP(sb) + return group_no * (ext2_fsblk_t)EXT2_BLOCKS_PER_GROUP(sb) +
le32_to_cpu(EXT2_SB(sb)->s_es->s_first_data_block); le32_to_cpu(EXT2_SB(sb)->s_es->s_first_data_block);
} }
#define ext2_set_bit __test_and_set_bit_le
#define ext2_clear_bit __test_and_clear_bit_le
#define ext2_test_bit test_bit_le
#define ext2_find_first_zero_bit find_first_zero_bit_le
#define ext2_find_next_zero_bit find_next_zero_bit_le

1
include/asm-generic/bitops.h
View file

@ -39,7 +39,6 @@
#include <asm-generic/bitops/atomic.h> #include <asm-generic/bitops/atomic.h>
#include <asm-generic/bitops/non-atomic.h> #include <asm-generic/bitops/non-atomic.h>
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-non-atomic.h>
#include <asm-generic/bitops/ext2-atomic.h> #include <asm-generic/bitops/ext2-atomic.h>
#include <asm-generic/bitops/minix.h> #include <asm-generic/bitops/minix.h>

18
include/asm-generic/bitops/ext2-non-atomic.h
View file

@ -1,18 +0,0 @@
#ifndef _ASM_GENERIC_BITOPS_EXT2_NON_ATOMIC_H_
#define _ASM_GENERIC_BITOPS_EXT2_NON_ATOMIC_H_
#define ext2_set_bit(nr,addr) \
__test_and_set_bit_le((nr), (unsigned long *)(addr))
#define ext2_clear_bit(nr,addr) \
__test_and_clear_bit_le((nr), (unsigned long *)(addr))
#define ext2_test_bit(nr,addr) \
test_bit_le((nr), (unsigned long *)(addr))
#define ext2_find_first_zero_bit(addr, size) \
find_first_zero_bit_le((unsigned long *)(addr), (size))
#define ext2_find_next_zero_bit(addr, size, off) \
find_next_zero_bit_le((unsigned long *)(addr), (size), (off))
#define ext2_find_next_bit(addr, size, off) \
find_next_bit_le((unsigned long *)(addr), (size), (off))
#endif /* _ASM_GENERIC_BITOPS_EXT2_NON_ATOMIC_H_ */