b=23289 cleanup assertion on atomic

[fs/lustre-release.git] / lnet / klnds / o2iblnd / o2iblnd.h

diff --git a/lnet/klnds/o2iblnd/o2iblnd.h b/lnet/klnds/o2iblnd/o2iblnd.h
index 8f7db5a..491cd70 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd.h
+++ b/lnet/klnds/o2iblnd/o2iblnd.h
@@ -647,7 +647,6 @@ kiblnd_dev_can_failover(kib_dev_t *dev)
 do {                                                            \
         CDEBUG(D_NET, "conn[%p] (%d)++\n",                      \
                (conn), cfs_atomic_read(&(conn)->ibc_refcount)); \
-        LASSERT(cfs_atomic_read(&(conn)->ibc_refcount) > 0);    \
         cfs_atomic_inc(&(conn)->ibc_refcount);                  \
 } while (0)
 
@@ -657,7 +656,7 @@ do {                                                                           \
                                                                                \
         CDEBUG(D_NET, "conn[%p] (%d)--\n",                                     \
                (conn), cfs_atomic_read(&(conn)->ibc_refcount));                \
-        LASSERT(cfs_atomic_read(&(conn)->ibc_refcount) > 0);                   \
+        LASSERT_ATOMIC_POS(&(conn)->ibc_refcount);                             \
         if (cfs_atomic_dec_and_test(&(conn)->ibc_refcount)) {                  \
                 cfs_spin_lock_irqsave(&kiblnd_data.kib_connd_lock, flags);     \
                 cfs_list_add_tail(&(conn)->ibc_list,                           \
@@ -672,7 +671,6 @@ do {                                                            \
         CDEBUG(D_NET, "peer[%p] -> %s (%d)++\n",                \
                (peer), libcfs_nid2str((peer)->ibp_nid),         \
                cfs_atomic_read (&(peer)->ibp_refcount));        \
-        LASSERT(cfs_atomic_read(&(peer)->ibp_refcount) > 0);    \
         cfs_atomic_inc(&(peer)->ibp_refcount);                  \
 } while (0)
 
@@ -681,7 +679,7 @@ do {                                                            \
         CDEBUG(D_NET, "peer[%p] -> %s (%d)--\n",                \
                (peer), libcfs_nid2str((peer)->ibp_nid),         \
                cfs_atomic_read (&(peer)->ibp_refcount));        \
-        LASSERT(cfs_atomic_read(&(peer)->ibp_refcount) > 0);    \
+        LASSERT_ATOMIC_POS(&(peer)->ibp_refcount);              \
         if (cfs_atomic_dec_and_test(&(peer)->ibp_refcount))     \
                 kiblnd_destroy_peer(peer);                      \
 } while (0)