Changes in kernel/generic/src/adt/cht.c [8f9c808:04552324] in mainline

File:

• kernel/generic/src/adt/cht.c (modified) (5 diffs)

kernel/generic/src/adt/cht.c

@@ -526 +526 @@
         ASSERT(op && op->hash && op->key_hash && op->equal && op->key_equal);
         /* Memoized hashes are stored in the rcu_link.func function pointer. */
-        STATIC_ASSERT(sizeof(size_t) == sizeof(rcu_func_t));
+        ASSERT(sizeof(size_t) == sizeof(rcu_func_t));
         ASSERT(sentinel.hash == (uintptr_t)sentinel.rcu_link.func);
 
@@ -1311 +1311 @@
                 }
         } else {
-                STATIC_ASSERT(N_JOIN == N_JOIN_FOLLOWS);
+                ASSERT(N_JOIN == N_JOIN_FOLLOWS);
                 
                 /* Keep the N_JOIN/N_JOIN_FOLLOWS mark but strip N_DELETED. */
@@ -1890 +1890 @@
         /* See comment in split_bucket(). */
         
-        bool done = false;
-
+        bool done;
         do {
                 bool resizing = false;
@@ -2061 +2060 @@
         cht_link_t *join_node, size_t split_hash)
 {
-        bool done = false;
-
+        bool done;
         do {
                 wnd_t wnd = {
@@ -2163 +2161 @@
 #endif
 
-        bool done = false;
-
+        bool done;
         do {
-                /* Load the most recent h->item_cnt. */
+                /* Load the most recent  h->item_cnt. */
                 read_barrier();
                 size_t cur_items = (size_t) atomic_get(&h->item_cnt);