rhashtable: rename rht_for_each*continue as *from.

[linux-2.6-microblaze.git] / include / linux / rhashtable.h

diff --git a/include/linux/rhashtable.h b/include/linux/rhashtable.h
index 3864193..86dfa41 100644 (file)
--- a/include/linux/rhashtable.h
+++ b/include/linux/rhashtable.h
@@ -306,13 +306,13 @@ static inline struct rhash_head __rcu **rht_bucket_insert(
 }
 
 /**
- * rht_for_each_continue - continue iterating over hash chain
+ * rht_for_each_from - iterate over hash chain from given head
  * @pos:       the &struct rhash_head to use as a loop cursor.
- * @head:      the previous &struct rhash_head to continue from
+ * @head:      the &struct rhash_head to start from
  * @tbl:       the &struct bucket_table
  * @hash:      the hash value / bucket index
  */
-#define rht_for_each_continue(pos, head, tbl, hash) \
+#define rht_for_each_from(pos, head, tbl, hash) \
        for (pos = rht_dereference_bucket(head, tbl, hash); \
             !rht_is_a_nulls(pos); \
             pos = rht_dereference_bucket((pos)->next, tbl, hash))
@@ -324,18 +324,18 @@ static inline struct rhash_head __rcu **rht_bucket_insert(
  * @hash:      the hash value / bucket index
  */
 #define rht_for_each(pos, tbl, hash) \
-       rht_for_each_continue(pos, *rht_bucket(tbl, hash), tbl, hash)
+       rht_for_each_from(pos, *rht_bucket(tbl, hash), tbl, hash)
 
 /**
- * rht_for_each_entry_continue - continue iterating over hash chain
+ * rht_for_each_entry_from - iterate over hash chain from given head
  * @tpos:      the type * to use as a loop cursor.
  * @pos:       the &struct rhash_head to use as a loop cursor.
- * @head:      the previous &struct rhash_head to continue from
+ * @head:      the &struct rhash_head to start from
  * @tbl:       the &struct bucket_table
  * @hash:      the hash value / bucket index
  * @member:    name of the &struct rhash_head within the hashable struct.
  */
-#define rht_for_each_entry_continue(tpos, pos, head, tbl, hash, member)        \
+#define rht_for_each_entry_from(tpos, pos, head, tbl, hash, member)    \
        for (pos = rht_dereference_bucket(head, tbl, hash);             \
             (!rht_is_a_nulls(pos)) && rht_entry(tpos, pos, member);    \
             pos = rht_dereference_bucket((pos)->next, tbl, hash))
@@ -349,7 +349,7 @@ static inline struct rhash_head __rcu **rht_bucket_insert(
  * @member:    name of the &struct rhash_head within the hashable struct.
  */
 #define rht_for_each_entry(tpos, pos, tbl, hash, member)               \
-       rht_for_each_entry_continue(tpos, pos, *rht_bucket(tbl, hash),  \
+       rht_for_each_entry_from(tpos, pos, *rht_bucket(tbl, hash),      \
                                    tbl, hash, member)
 
 /**
@@ -374,9 +374,9 @@ static inline struct rhash_head __rcu **rht_bucket_insert(
                       rht_dereference_bucket(pos->next, tbl, hash) : NULL)
 
 /**
- * rht_for_each_rcu_continue - continue iterating over rcu hash chain
+ * rht_for_each_rcu_from - iterate over rcu hash chain from given head
  * @pos:       the &struct rhash_head to use as a loop cursor.
- * @head:      the previous &struct rhash_head to continue from
+ * @head:      the &struct rhash_head to start from
  * @tbl:       the &struct bucket_table
  * @hash:      the hash value / bucket index
  *
@@ -384,7 +384,7 @@ static inline struct rhash_head __rcu **rht_bucket_insert(
  * the _rcu mutation primitives such as rhashtable_insert() as long as the
  * traversal is guarded by rcu_read_lock().
  */
-#define rht_for_each_rcu_continue(pos, head, tbl, hash)                        \
+#define rht_for_each_rcu_from(pos, head, tbl, hash)                    \
        for (({barrier(); }),                                           \
             pos = rht_dereference_bucket_rcu(head, tbl, hash);         \
             !rht_is_a_nulls(pos);                                      \
@@ -401,13 +401,13 @@ static inline struct rhash_head __rcu **rht_bucket_insert(
  * traversal is guarded by rcu_read_lock().
  */
 #define rht_for_each_rcu(pos, tbl, hash)                               \
-       rht_for_each_rcu_continue(pos, *rht_bucket(tbl, hash), tbl, hash)
+       rht_for_each_rcu_from(pos, *rht_bucket(tbl, hash), tbl, hash)
 
 /**
- * rht_for_each_entry_rcu_continue - continue iterating over rcu hash chain
+ * rht_for_each_entry_rcu_from - iterated over rcu hash chain from given head
  * @tpos:      the type * to use as a loop cursor.
  * @pos:       the &struct rhash_head to use as a loop cursor.
- * @head:      the previous &struct rhash_head to continue from
+ * @head:      the &struct rhash_head to start from
  * @tbl:       the &struct bucket_table
  * @hash:      the hash value / bucket index
  * @member:    name of the &struct rhash_head within the hashable struct.
@@ -416,7 +416,7 @@ static inline struct rhash_head __rcu **rht_bucket_insert(
  * the _rcu mutation primitives such as rhashtable_insert() as long as the
  * traversal is guarded by rcu_read_lock().
  */
-#define rht_for_each_entry_rcu_continue(tpos, pos, head, tbl, hash, member) \
+#define rht_for_each_entry_rcu_from(tpos, pos, head, tbl, hash, member) \
        for (({barrier(); }),                                               \
             pos = rht_dereference_bucket_rcu(head, tbl, hash);             \
             (!rht_is_a_nulls(pos)) && rht_entry(tpos, pos, member);        \
@@ -435,7 +435,7 @@ static inline struct rhash_head __rcu **rht_bucket_insert(
  * traversal is guarded by rcu_read_lock().
  */
 #define rht_for_each_entry_rcu(tpos, pos, tbl, hash, member)              \
-       rht_for_each_entry_rcu_continue(tpos, pos, *rht_bucket(tbl, hash), \
+       rht_for_each_entry_rcu_from(tpos, pos, *rht_bucket(tbl, hash), \
                                        tbl, hash, member)
 
 /**
@@ -491,7 +491,7 @@ restart:
        hash = rht_key_hashfn(ht, tbl, key, params);
        head = rht_bucket(tbl, hash);
        do {
-               rht_for_each_rcu_continue(he, *head, tbl, hash) {
+               rht_for_each_rcu_from(he, *head, tbl, hash) {
                        if (params.obj_cmpfn ?
                            params.obj_cmpfn(&arg, rht_obj(ht, he)) :
                            rhashtable_compare(&arg, rht_obj(ht, he)))
@@ -625,7 +625,7 @@ slow_path:
        if (!pprev)
                goto out;
 
-       rht_for_each_continue(head, *pprev, tbl, hash) {
+       rht_for_each_from(head, *pprev, tbl, hash) {
                struct rhlist_head *plist;
                struct rhlist_head *list;
 
@@ -890,7 +890,7 @@ static inline int __rhashtable_remove_fast_one(
        spin_lock_bh(lock);
 
        pprev = rht_bucket_var(tbl, hash);
-       rht_for_each_continue(he, *pprev, tbl, hash) {
+       rht_for_each_from(he, *pprev, tbl, hash) {
                struct rhlist_head *list;
 
                list = container_of(he, struct rhlist_head, rhead);
@@ -1042,7 +1042,7 @@ static inline int __rhashtable_replace_fast(
        spin_lock_bh(lock);
 
        pprev = rht_bucket_var(tbl, hash);
-       rht_for_each_continue(he, *pprev, tbl, hash) {
+       rht_for_each_from(he, *pprev, tbl, hash) {
                if (he != obj_old) {
                        pprev = &he->next;
                        continue;