projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rcuja: rename new_node to node in add functions
[userspace-rcu.git]
/
rcuja
/
rcuja.c
diff --git
a/rcuja/rcuja.c
b/rcuja/rcuja.c
index 22ee01cef781e3977ba4884538b66a08697b633a..ca72e040d7087396dfb46ed307dd7f5ff4d0ee16 100644
(file)
--- a/
rcuja/rcuja.c
+++ b/
rcuja/rcuja.c
@@
-2015,7
+2015,7
@@
end:
static
int _cds_ja_add(struct cds_ja *ja, uint64_t key,
static
int _cds_ja_add(struct cds_ja *ja, uint64_t key,
- struct cds_ja_node *n
ew_n
ode,
+ struct cds_ja_node *node,
struct cds_ja_node **unique_node_ret)
{
unsigned int tree_depth, i;
struct cds_ja_node **unique_node_ret)
{
unsigned int tree_depth, i;
@@
-2036,7
+2036,7
@@
int _cds_ja_add(struct cds_ja *ja, uint64_t key,
retry:
dbg_printf("cds_ja_add attempt: key %" PRIu64 ", node %p\n",
retry:
dbg_printf("cds_ja_add attempt: key %" PRIu64 ", node %p\n",
- key, n
ew_n
ode);
+ key, node);
parent2_node_flag = NULL;
parent_node_flag =
(struct cds_ja_inode_flag *) &ja->root; /* Use root ptr address as key for mutex */
parent2_node_flag = NULL;
parent_node_flag =
(struct cds_ja_inode_flag *) &ja->root; /* Use root ptr address as key for mutex */
@@
-2079,7
+2079,7
@@
retry:
parent_attach_node_flag,
node_flag_ptr,
node_flag,
parent_attach_node_flag,
node_flag_ptr,
node_flag,
- key, i, n
ew_n
ode);
+ key, i, node);
} else {
if (unique_node_ret) {
*unique_node_ret = (struct cds_ja_node *) ja_node_ptr(node_flag);
} else {
if (unique_node_ret) {
*unique_node_ret = (struct cds_ja_node *) ja_node_ptr(node_flag);
@@
-2097,7
+2097,7
@@
retry:
parent_attach_node_flag,
attach_node_flag_ptr,
attach_node_flag,
parent_attach_node_flag,
attach_node_flag_ptr,
attach_node_flag,
- n
ew_n
ode);
+ node);
}
if (ret == -EAGAIN || ret == -EEXIST)
goto retry;
}
if (ret == -EAGAIN || ret == -EEXIST)
goto retry;
@@
-2106,22
+2106,22
@@
retry:
}
int cds_ja_add(struct cds_ja *ja, uint64_t key,
}
int cds_ja_add(struct cds_ja *ja, uint64_t key,
- struct cds_ja_node *n
ew_n
ode)
+ struct cds_ja_node *node)
{
{
- return _cds_ja_add(ja, key, n
ew_n
ode, NULL);
+ return _cds_ja_add(ja, key, node, NULL);
}
struct cds_ja_node *cds_ja_add_unique(struct cds_ja *ja, uint64_t key,
}
struct cds_ja_node *cds_ja_add_unique(struct cds_ja *ja, uint64_t key,
- struct cds_ja_node *n
ew_n
ode)
+ struct cds_ja_node *node)
{
int ret;
struct cds_ja_node *ret_node;
{
int ret;
struct cds_ja_node *ret_node;
- ret = _cds_ja_add(ja, key, n
ew_n
ode, &ret_node);
+ ret = _cds_ja_add(ja, key, node, &ret_node);
if (ret == -EEXIST)
return ret_node;
else
if (ret == -EEXIST)
return ret_node;
else
- return n
ew_n
ode;
+ return node;
}
/*
}
/*
This page took
0.024588 seconds
and
4
git commands to generate.