projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofpbuf: New function ofpbuf_use_stack().
[openvswitch]
/
datapath
/
table.c
diff --git
a/datapath/table.c
b/datapath/table.c
index d2432e89da2ceacf34eaf7dd390196ab8f40d8c7..79b9bc1bd2c8f7b8793aa2b5f6b8cbd7b8295a72 100644
(file)
--- a/
datapath/table.c
+++ b/
datapath/table.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009, 2010 Nicira Networks.
+ * Copyright (c) 2009, 2010
, 2011
Nicira Networks.
* Distributed under the terms of the GNU GPL version 2.
*
* Significant portions of this file may be copied from parts of the Linux
* Distributed under the terms of the GNU GPL version 2.
*
* Significant portions of this file may be copied from parts of the Linux
@@
-40,17
+40,18
@@
static struct tbl_bucket *bucket_alloc(int n_objs)
return kmalloc(bucket_size(n_objs), GFP_KERNEL);
}
return kmalloc(bucket_size(n_objs), GFP_KERNEL);
}
-static void free_buckets(struct tbl_bucket ***l1, unsigned int n_buckets,
+static void free_buckets(struct tbl_bucket __rcu ***l1,
+ unsigned int n_buckets,
void (*free_obj)(struct tbl_node *))
{
unsigned int i;
for (i = 0; i < n_buckets >> TBL_L1_SHIFT; i++) {
void (*free_obj)(struct tbl_node *))
{
unsigned int i;
for (i = 0; i < n_buckets >> TBL_L1_SHIFT; i++) {
- struct tbl_bucket **l2 = l1[i];
+ struct tbl_bucket
__rcu
**l2 = l1[i];
unsigned int j;
for (j = 0; j < TBL_L2_SIZE; j++) {
unsigned int j;
for (j = 0; j < TBL_L2_SIZE; j++) {
- struct tbl_bucket *bucket = l2[j];
+ struct tbl_bucket *bucket =
(struct tbl_bucket __force *)
l2[j];
if (!bucket)
continue;
if (!bucket)
continue;
@@
-66,9
+67,9
@@
static void free_buckets(struct tbl_bucket ***l1, unsigned int n_buckets,
kfree(l1);
}
kfree(l1);
}
-static struct tbl_bucket ***alloc_buckets(unsigned int n_buckets)
+static struct tbl_bucket
__rcu
***alloc_buckets(unsigned int n_buckets)
{
{
- struct tbl_bucket ***l1;
+ struct tbl_bucket
__rcu
***l1;
unsigned int i;
l1 = kmalloc((n_buckets >> TBL_L1_SHIFT) * sizeof(struct tbl_bucket **),
unsigned int i;
l1 = kmalloc((n_buckets >> TBL_L1_SHIFT) * sizeof(struct tbl_bucket **),
@@
-76,7
+77,7
@@
static struct tbl_bucket ***alloc_buckets(unsigned int n_buckets)
if (!l1)
return NULL;
for (i = 0; i < n_buckets >> TBL_L1_SHIFT; i++) {
if (!l1)
return NULL;
for (i = 0; i < n_buckets >> TBL_L1_SHIFT; i++) {
- l1[i] = (struct tbl_bucket **)get_zeroed_page(GFP_KERNEL);
+ l1[i] = (struct tbl_bucket
__rcu
**)get_zeroed_page(GFP_KERNEL);
if (!l1[i]) {
free_buckets(l1, i << TBL_L1_SHIFT, NULL);
return NULL;
if (!l1[i]) {
free_buckets(l1, i << TBL_L1_SHIFT, NULL);
return NULL;
@@
-97,7
+98,7
@@
struct tbl *tbl_create(unsigned int n_buckets)
{
struct tbl *table;
{
struct tbl *table;
- table = kzalloc(sizeof
*table
, GFP_KERNEL);
+ table = kzalloc(sizeof
(*table)
, GFP_KERNEL);
if (!table)
goto err;
if (!table)
goto err;