LU-3963 libcfs: remove the last of cfs_atomic

With all cfs_atomic wrappers removed from lustre and libcfs
this patch removes the last bits of the cfs_atomic wrappers.

Change-Id: I8ede88fe45b7ddd82036b2f2a7907e4eb1604a5e
Signed-off-by: James Simmons <uja.ornl@gmail.com>
Reviewed-on: http://review.whamcloud.com/9902
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>

diff --git a/contrib/scripts/libcfs_cleanup.sed b/contrib/scripts/libcfs_cleanup.sed
index 7d5aa99..ea3cad2 100644 (file)
--- a/contrib/scripts/libcfs_cleanup.sed
+++ b/contrib/scripts/libcfs_cleanup.sed
@@ -594,44 +594,6 @@ s/\bcfs_groups_alloc\b/groups_alloc/g
 s/\bcfs_get_random_bytes_prim\b/get_random_bytes/g
 /#[ \t]*define[ \t]*\bget_random_bytes\b *( *\w* *, *\w* *)[ \t]*\bget_random_bytes\b *( *\w* *, *\w* *)/d
 
 s/\bcfs_get_random_bytes_prim\b/get_random_bytes/g
 /#[ \t]*define[ \t]*\bget_random_bytes\b *( *\w* *, *\w* *)[ \t]*\bget_random_bytes\b *( *\w* *, *\w* *)/d
 

-# atomic
-s/\bcfs_atomic_t\b/atomic_t/g
-/typedef[ \t]*\batomic_t\b[ \t]*\batomic_t\b/d
-s/\bcfs_atomic_read\b/atomic_read/g
-/#[ \t]*define[ \t]*\batomic_read\b *( *\w* *)[ \t]*\batomic_read\b *( *\w* *)/d
-s/\bcfs_atomic_add_unless\b/atomic_add_unless/g
-s/\bcfs_atomic_cmpxchg\b/atomic_cmpxchg/g
-s/\bcfs_atomic_inc\b/atomic_inc/g
-/#[ \t]*define[ \t]*\batomic_inc\b *( *\w* *)[ \t]*\batomic_inc\b *( *\w* *)/d
-s/\bcfs_atomic_inc_and_test\b/atomic_inc_and_test/g
-/#[ \t]*define[ \t]*\batomic_inc_and_test\b *( *\w* *)[ \t]*\batomic_inc_and_test\b *( *\w* *)/d
-s/\bcfs_atomic_inc_return\b/atomic_inc_return/g
-/#[ \t]*define[ \t]*\batomic_inc_return\b *( *\w* *)[ \t]*\batomic_inc_return\b *( *\w* *)/d
-s/\bcfs_atomic_inc_not_zero\b/atomic_inc_not_zero/g
-/#[ \t]*define[ \t]*\batomic_inc_not_zero\b *( *\w* *)[ \t]*\batomic_inc_not_zero\b *( *\w* *)/d
-s/\bcfs_atomic_dec\b/atomic_dec/g
-/#[ \t]*define[ \t]*\batomic_dec\b *( *\w* *)[ \t]*\batomic_dec\b *( *\w* *)/d
-s/\bcfs_atomic_dec_and_test\b/atomic_dec_and_test/g
-/#[ \t]*define[ \t]*\batomic_dec_and_test\b *( *\w* *)[ \t]*\batomic_dec_and_test\b *( *\w* *)/d
-s/\bcfs_atomic_dec_return\b/atomic_dec_return/g
-/#[ \t]*define[ \t]*\batomic_dec_return\b *( *\w* *)[ \t]*\batomic_dec_return\b *( *\w* *)/d
-s/\bcfs_atomic_dec_and_lock\b/atomic_dec_and_lock/g
-/#[ \t]*define[ \t]*\batomic_dec_and_lock\b *( *\w* *, *\w* *)[ \t]*\batomic_dec_and_lock\b *( *\w* *, *\w* *)/d
-s/\bcfs_atomic_set\b/atomic_set/g
-/#[ \t]*define[ \t]*\batomic_set\b *( *\w* *, *\w* *)[ \t]*\batomic_set\b *( *\w* *, *\w* *)/d
-s/\bcfs_atomic_add\b/atomic_add/g
-/#[ \t]*define[ \t]*\batomic_add\b *( *\w* *, *\w* *)[ \t]*\batomic_add\b *( *\w* *, *\w* *)/d
-s/\bcfs_atomic_add_return\b/atomic_add_return/g
-/#[ \t]*define[ \t]*\batomic_add_return\b *( *\w* *, *\w* *)[ \t]*\batomic_add_return\b *( *\w* *, *\w* *)/d
-s/\bcfs_atomic_sub\b/atomic_sub/g
-/#[ \t]*define[ \t]*\batomic_sub\b *( *\w* *, *\w* *)[ \t]*\batomic_sub\b *( *\w* *, *\w* *)/d
-s/\bcfs_atomic_sub_and_test\b/atomic_sub_and_test/g
-/#[ \t]*define[ \t]*\batomic_sub_and_test\b *( *\w* *, *\w* *)[ \t]*\batomic_sub_and_test\b *( *\w* *, *\w* *)/d
-s/\bcfs_atomic_sub_return\b/atomic_sub_return/g
-/#[ \t]*define[ \t]*\batomic_sub_return\b *( *\w* *, *\w* *)[ \t]*\batomic_sub_return\b *( *\w* *, *\w* *)/d
-s/\bCFS_ATOMIC_INIT\b/ATOMIC_INIT/g
-/#[ \t]*define[ \t]*\bATOMIC_INIT\b *( *\w* *)[ \t]*\bATOMIC_INIT\b *( *\w* *)/d
-

 ################################################################################
 # list operations
 s/\bcfs_list_t\b/struct list_head/g
 ################################################################################
 # list operations
 s/\bcfs_list_t\b/struct list_head/g

diff --git a/libcfs/include/libcfs/libcfs.h b/libcfs/include/libcfs/libcfs.h
index 01fd891..19a7257 100644 (file)
--- a/libcfs/include/libcfs/libcfs.h
+++ b/libcfs/include/libcfs/libcfs.h
@@ -90,32 +90,6 @@ static inline int __is_po2(unsigned long long val)
 #define LERRCHKSUM(hexnum) (((hexnum) & 0xf) ^ ((hexnum) >> 4 & 0xf) ^ \
                            ((hexnum) >> 8 & 0xf))
 
 #define LERRCHKSUM(hexnum) (((hexnum) & 0xf) ^ ((hexnum) >> 4 & 0xf) ^ \
                            ((hexnum) >> 8 & 0xf))
 

-
-/*
- * - * atomic
- */
-
-typedef atomic_t cfs_atomic_t;
-
-#define cfs_atomic_read(atom)                atomic_read(atom)
-#define cfs_atomic_inc(atom)                 atomic_inc(atom)
-#define cfs_atomic_inc_and_test(atom)        atomic_inc_and_test(atom)
-#define cfs_atomic_inc_return(atom)          atomic_inc_return(atom)
-#define cfs_atomic_inc_not_zero(atom)        atomic_inc_not_zero(atom)
-#define cfs_atomic_add_unless(atom, a, u)    atomic_add_unless(atom, a, u)
-#define cfs_atomic_dec(atom)                 atomic_dec(atom)
-#define cfs_atomic_dec_and_test(atom)        atomic_dec_and_test(atom)
-#define cfs_atomic_dec_and_lock(atom, lock)  atomic_dec_and_lock(atom, lock)
-#define cfs_atomic_dec_return(atom)          atomic_dec_return(atom)
-#define cfs_atomic_set(atom, value)          atomic_set(atom, value)
-#define cfs_atomic_add(value, atom)          atomic_add(value, atom)
-#define cfs_atomic_add_return(value, atom)   atomic_add_return(value, atom)
-#define cfs_atomic_sub(value, atom)          atomic_sub(value, atom)
-#define cfs_atomic_sub_and_test(value, atom) atomic_sub_and_test(value, atom)
-#define cfs_atomic_sub_return(value, atom)   atomic_sub_return(value, atom)
-#define cfs_atomic_cmpxchg(atom, old, nv)    atomic_cmpxchg(atom, old, nv)
-#define CFS_ATOMIC_INIT(i)                   ATOMIC_INIT(i)
-

 /*
  * Some (nomina odiosa sunt) platforms define NULL as naked 0. This confuses
  * Lustre RETURN(NULL) macro.
 /*
  * Some (nomina odiosa sunt) platforms define NULL as naked 0. This confuses
  * Lustre RETURN(NULL) macro.