X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Ftable.c;h=280630854a6435d830e132fd53d019aa5ad2252d;hb=83c19ab15aa7b2d63632ac9694541759bc8d2351;hp=5ea2c93b4835f574ea926d9dd742b80eb2fc1558;hpb=fceb2a5bb2063023777fc75c68a2670b5169fa13;p=openvswitch

diff --git a/datapath/table.c b/datapath/table.c
index 5ea2c93b..28063085 100644
--- a/datapath/table.c
+++ b/datapath/table.c
@@ -15,30 +15,6 @@
 #include <linux/mm.h>
 #include <asm/pgtable.h>
 
-/**
- * struct tbl - hash table
- * @n_buckets: number of buckets (a power of 2 between %TBL_L1_SIZE and
- * %TBL_MAX_BUCKETS)
- * @buckets: pointer to @n_buckets/%TBL_L1_SIZE pointers to %TBL_L1_SIZE pointers
- * to buckets
- * @rcu: RCU callback structure
- * @obj_destructor: Called on each element when the table is destroyed.
- *
- * The @buckets array is logically an array of pointers to buckets.  It is
- * broken into two levels to avoid the need to kmalloc() any object larger than
- * a single page or to use vmalloc().  @buckets is always nonnull, as is each
- * @buckets[i], but each @buckets[i][j] is nonnull only if the specified hash
- * bucket is nonempty (for 0 <= i < @n_buckets/%TBL_L1_SIZE, 0 <= j <
- * %TBL_L1_SIZE).
- */
-struct tbl {
-	struct rcu_head rcu;
-	unsigned int n_buckets;
-	struct tbl_bucket ***buckets;
-	unsigned int count;
-	void (*obj_destructor)(struct tbl_node *);
-};
-
 /**
  * struct tbl_bucket - single bucket within a hash table
  * @rcu: RCU callback structure
@@ -102,7 +78,7 @@ static struct tbl_bucket ***alloc_buckets(unsigned int n_buckets)
 	for (i = 0; i < n_buckets >> TBL_L1_BITS; i++) {
 		l1[i] = (struct tbl_bucket **)get_zeroed_page(GFP_KERNEL);
 		if (!l1[i]) {
-			free_buckets(l1, i << TBL_L1_BITS, 0);
+			free_buckets(l1, i << TBL_L1_BITS, NULL);
 			return NULL;
 		}
 	}
@@ -185,7 +161,7 @@ void tbl_deferred_destroy(struct tbl *table, void (*destructor)(struct tbl_node
 	call_rcu(&table->rcu, destroy_table_rcu);
 }
 
-static struct tbl_bucket **find_bucket(struct tbl *table, u32 hash)
+static struct tbl_bucket __rcu **find_bucket(struct tbl *table, u32 hash)
 {
 	unsigned int l1 = (hash & (table->n_buckets - 1)) >> TBL_L1_SHIFT;
 	unsigned int l2 = hash & ((1 << TBL_L2_BITS) - 1);
@@ -198,7 +174,7 @@ static int search_bucket(const struct tbl_bucket *bucket, void *target, u32 hash
 	int i;
 
 	for (i = 0; i < bucket->n_objs; i++) {
-		struct tbl_node *obj = rcu_dereference(bucket->objs[i]);
+		struct tbl_node *obj = bucket->objs[i];
 		if (obj->hash == hash && likely(cmp(obj, target)))
 			return i;
 	}
@@ -221,7 +197,7 @@ static int search_bucket(const struct tbl_bucket *bucket, void *target, u32 hash
 struct tbl_node *tbl_lookup(struct tbl *table, void *target, u32 hash,
 			    int (*cmp)(const struct tbl_node *, void *))
 {
-	struct tbl_bucket **bucketp = find_bucket(table, hash);
+	struct tbl_bucket __rcu **bucketp = find_bucket(table, hash);
 	struct tbl_bucket *bucket = rcu_dereference(*bucketp);
 	int index;
 
@@ -254,7 +230,7 @@ int tbl_foreach(struct tbl *table,
 {
 	unsigned int i, j, k;
 	for (i = 0; i < table->n_buckets >> TBL_L1_BITS; i++) {
-		struct tbl_bucket **l2 = table->buckets[i];
+		struct tbl_bucket __rcu **l2 = table->buckets[i];
 		for (j = 0; j < TBL_L1_SIZE; j++) {
 			struct tbl_bucket *bucket = rcu_dereference(l2[j]);
 			if (!bucket)
@@ -342,8 +318,8 @@ static void free_bucket_rcu(struct rcu_head *rcu)
  */
 int tbl_insert(struct tbl *table, struct tbl_node *target, u32 hash)
 {
-	struct tbl_bucket **oldp = find_bucket(table, hash);
-	struct tbl_bucket *old = *rcu_dereference(oldp);
+	struct tbl_bucket __rcu **oldp = find_bucket(table, hash);
+	struct tbl_bucket *old = rcu_dereference(*oldp);
 	unsigned int n = old ? old->n_objs : 0;
 	struct tbl_bucket *new = bucket_alloc(n + 1);
 
@@ -380,8 +356,8 @@ int tbl_insert(struct tbl *table, struct tbl_node *target, u32 hash)
  */
 int tbl_remove(struct tbl *table, struct tbl_node *target)
 {
-	struct tbl_bucket **oldp = find_bucket(table, target->hash);
-	struct tbl_bucket *old = *rcu_dereference(oldp);
+	struct tbl_bucket __rcu **oldp = find_bucket(table, target->hash);
+	struct tbl_bucket *old = rcu_dereference(*oldp);
 	unsigned int n = old->n_objs;
 	struct tbl_bucket *new;