Skip to content

L
linux
Commit 148817ba authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files
Options

asm-generic: add another generic ext2 atomic bitops 

The majority of architectures implement ext2 atomic bitops as
test_and_{set,clear}_bit() without spinlock.

This adds this type of generic implementation in ext2-atomic-setbit.h and
use it wherever possible.
Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Suggested-by: default avatarAndreas Dilger <adilger@dilger.ca>
Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b2c9cd37
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 59 deletions
arch/alpha/include/asm/bitops.h
View file @ 148817ba
...@@ -456,8 +456,7 @@ sched_find_first_bit(const unsigned long b[2]) ...@@ -456,8 +456,7 @@ sched_find_first_bit(const unsigned long b[2])
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#define ext2_set_bit_atomic(l,n,a) test_and_set_bit(n,a) #include <asm-generic/bitops/ext2-atomic-setbit.h>
#define ext2_clear_bit_atomic(l,n,a) test_and_clear_bit(n,a)
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
arch/arm/include/asm/bitops.h
View file @ 148817ba
...@@ -310,10 +310,7 @@ static inline int find_next_bit_le(const void *p, int size, int offset) ...@@ -310,10 +310,7 @@ 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.
*/ */
#define ext2_set_bit_atomic(lock, nr, p) \ #include <asm-generic/bitops/ext2-atomic-setbit.h>
test_and_set_bit_le(nr, p)
#define ext2_clear_bit_atomic(lock, nr, p) \
test_and_clear_bit_le(nr, p)
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
arch/cris/include/asm/bitops.h
View file @ 148817ba
...@@ -156,8 +156,7 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr) ...@@ -156,8 +156,7 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr)
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#define ext2_set_bit_atomic(l,n,a) test_and_set_bit(n,a) #include <asm-generic/bitops/ext2-atomic-setbit.h>
#define ext2_clear_bit_atomic(l,n,a) test_and_clear_bit(n,a)
#include <asm-generic/bitops/sched.h> #include <asm-generic/bitops/sched.h>
......
arch/frv/include/asm/bitops.h
View file @ 148817ba
...@@ -403,8 +403,7 @@ int __ilog2_u64(u64 n) ...@@ -403,8 +403,7 @@ int __ilog2_u64(u64 n)
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#define ext2_set_bit_atomic(lock,nr,addr) test_and_set_bit ((nr) ^ 0x18, (addr)) #include <asm-generic/bitops/ext2-atomic-setbit.h>
#define ext2_clear_bit_atomic(lock,nr,addr) test_and_clear_bit((nr) ^ 0x18, (addr))
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
arch/ia64/include/asm/bitops.h
View file @ 148817ba
...@@ -458,8 +458,7 @@ static __inline__ unsigned long __arch_hweight64(unsigned long x) ...@@ -458,8 +458,7 @@ static __inline__ unsigned long __arch_hweight64(unsigned long x)
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#define ext2_set_bit_atomic(l,n,a) test_and_set_bit(n,a) #include <asm-generic/bitops/ext2-atomic-setbit.h>
#define ext2_clear_bit_atomic(l,n,a) test_and_clear_bit(n,a)
#include <asm-generic/bitops/sched.h> #include <asm-generic/bitops/sched.h>
......
arch/mn10300/include/asm/bitops.h
View file @ 148817ba
...@@ -227,12 +227,7 @@ int ffs(int x) ...@@ -227,12 +227,7 @@ int ffs(int x)
#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/hweight.h> #include <asm-generic/bitops/hweight.h>
#include <asm-generic/bitops/ext2-atomic-setbit.h>
#define ext2_set_bit_atomic(lock, nr, addr) \
test_and_set_bit((nr), (addr))
#define ext2_clear_bit_atomic(lock, nr, addr) \
test_and_clear_bit((nr), (addr))
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
arch/parisc/include/asm/bitops.h
View file @ 148817ba
...@@ -223,14 +223,7 @@ static __inline__ int fls(int x) ...@@ -223,14 +223,7 @@ 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-atomic-setbit.h>
/* '3' is bits per byte */
#define LE_BYTE_ADDR ((sizeof(unsigned long) - 1) << 3)
#define ext2_set_bit_atomic(l,nr,addr) \
test_and_set_bit((nr) ^ LE_BYTE_ADDR, (unsigned long *)addr)
#define ext2_clear_bit_atomic(l,nr,addr) \
test_and_clear_bit( (nr) ^ LE_BYTE_ADDR, (unsigned long *)addr)
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
arch/powerpc/include/asm/bitops.h
View file @ 148817ba
...@@ -327,10 +327,7 @@ unsigned long find_next_bit_le(const void *addr, ...@@ -327,10 +327,7 @@ 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_atomic(lock, nr, addr) \ #include <asm-generic/bitops/ext2-atomic-setbit.h>
test_and_set_bit_le((nr), (unsigned long*)addr)
#define ext2_clear_bit_atomic(lock, nr, addr) \
test_and_clear_bit_le((nr), (unsigned long*)addr)
#include <asm-generic/bitops/sched.h> #include <asm-generic/bitops/sched.h>
......
arch/s390/include/asm/bitops.h
View file @ 148817ba
...@@ -832,10 +832,7 @@ static inline int find_next_bit_le(void *vaddr, unsigned long size, ...@@ -832,10 +832,7 @@ static inline int find_next_bit_le(void *vaddr, unsigned long size,
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#define ext2_set_bit_atomic(lock, nr, addr) \ #include <asm-generic/bitops/ext2-atomic-setbit.h>
test_and_set_bit_le(nr, addr)
#define ext2_clear_bit_atomic(lock, nr, addr) \
test_and_clear_bit_le(nr, addr)
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
arch/sparc/include/asm/bitops_64.h
View file @ 148817ba
...@@ -91,10 +91,7 @@ static inline unsigned int __arch_hweight8(unsigned int w) ...@@ -91,10 +91,7 @@ static inline unsigned int __arch_hweight8(unsigned int w)
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#define ext2_set_bit_atomic(lock,nr,addr) \ #include <asm-generic/bitops/ext2-atomic-setbit.h>
test_and_set_bit((nr) ^ 0x38,(unsigned long *)(addr))
#define ext2_clear_bit_atomic(lock,nr,addr) \
test_and_clear_bit((nr) ^ 0x38,(unsigned long *)(addr))
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
arch/tile/include/asm/bitops_64.h
View file @ 148817ba
...@@ -97,9 +97,6 @@ static inline int test_and_change_bit(unsigned nr, ...@@ -97,9 +97,6 @@ static inline int test_and_change_bit(unsigned nr,
return (oldval & mask) != 0; return (oldval & mask) != 0;
} }
#define ext2_set_bit_atomic(lock, nr, addr) \ #include <asm-generic/bitops/ext2-atomic-setbit.h>
test_and_set_bit((nr), (unsigned long *)(addr))
#define ext2_clear_bit_atomic(lock, nr, addr) \
test_and_clear_bit((nr), (unsigned long *)(addr))
#endif /* _ASM_TILE_BITOPS_64_H */ #endif /* _ASM_TILE_BITOPS_64_H */
arch/x86/include/asm/bitops.h
View file @ 148817ba
...@@ -458,10 +458,7 @@ static inline int fls(int x) ...@@ -458,10 +458,7 @@ static inline int fls(int x)
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#define ext2_set_bit_atomic(lock, nr, addr) \ #include <asm-generic/bitops/ext2-atomic-setbit.h>
test_and_set_bit((nr), (unsigned long *)(addr))
#define ext2_clear_bit_atomic(lock, nr, addr) \
test_and_clear_bit((nr), (unsigned long *)(addr))
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_X86_BITOPS_H */ #endif /* _ASM_X86_BITOPS_H */
arch/xtensa/include/asm/bitops.h
View file @ 148817ba
...@@ -108,19 +108,7 @@ static inline unsigned long __fls(unsigned long word) ...@@ -108,19 +108,7 @@ static inline unsigned long __fls(unsigned long word)
#include <asm-generic/bitops/find.h> #include <asm-generic/bitops/find.h>
#include <asm-generic/bitops/le.h> #include <asm-generic/bitops/le.h>
#ifdef __XTENSA_EL__ #include <asm-generic/bitops/ext2-atomic-setbit.h>
# define ext2_set_bit_atomic(lock,nr,addr) \
test_and_set_bit((nr), (unsigned long*)(addr))
# define ext2_clear_bit_atomic(lock,nr,addr) \
test_and_clear_bit((nr), (unsigned long*)(addr))
#elif defined(__XTENSA_EB__)
# define ext2_set_bit_atomic(lock,nr,addr) \
test_and_set_bit((nr) ^ 0x18, (unsigned long*)(addr))
# define ext2_clear_bit_atomic(lock,nr,addr) \
test_and_clear_bit((nr) ^ 0x18, (unsigned long*)(addr))
#else
# error processor byte order undefined!
#endif
#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/ext2-atomic-setbit.h 0 → 100644
View file @ 148817ba
#ifndef _ASM_GENERIC_BITOPS_EXT2_ATOMIC_SETBIT_H_
#define _ASM_GENERIC_BITOPS_EXT2_ATOMIC_SETBIT_H_
/*
* Atomic bitops based version of ext2 atomic bitops
*/
#define ext2_set_bit_atomic(l, nr, addr) test_and_set_bit_le(nr, addr)
#define ext2_clear_bit_atomic(l, nr, addr) test_and_clear_bit_le(nr, addr)
#endif /* _ASM_GENERIC_BITOPS_EXT2_ATOMIC_SETBIT_H_ */
include/asm-generic/bitops/ext2-atomic.h
View file @ 148817ba
#ifndef _ASM_GENERIC_BITOPS_EXT2_ATOMIC_H_ #ifndef _ASM_GENERIC_BITOPS_EXT2_ATOMIC_H_
#define _ASM_GENERIC_BITOPS_EXT2_ATOMIC_H_ #define _ASM_GENERIC_BITOPS_EXT2_ATOMIC_H_
/*
* Spinlock based version of ext2 atomic bitops
*/
#define ext2_set_bit_atomic(lock, nr, addr) \ #define ext2_set_bit_atomic(lock, nr, addr) \
({ \ ({ \
int ret; \ int ret; \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7