diff options
| author |  David S. Miller <davem@davemloft.net>
| 2009-07-16 17:34:50 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net>
| 2009-07-16 17:34:50 -0700 |
| commit | 95aa1fe4abfc8d75dcd110bb285b09740214d053 (patch) | |
| tree | 668998047f77fe5d7f76ecbceec73a4f4c8311a6 /Documentation | |
| parent | net/can: add module alias to can protocol drivers (diff) | |
| parent | netfilter: nf_conntrack: nf_conntrack_alloc() fixes (diff) | |
| download | linux-95aa1fe4abfc8d75dcd110bb285b09740214d053.tar.gz linux-95aa1fe4abfc8d75dcd110bb285b09740214d053.tar.bz2 linux-95aa1fe4abfc8d75dcd110bb285b09740214d053.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RCU/rculist_nulls.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/RCU/rculist_nulls.txt b/Documentation/RCU/rculist_nulls.txt index 93cb28d05dcd..18f9651ff23d 100644 --- a/Documentation/RCU/rculist_nulls.txt +++ b/Documentation/RCU/rculist_nulls.txt @@ -83,11 +83,12 @@ not detect it missed following items in original chain. obj = kmem_cache_alloc(...); lock_chain(); // typically a spin_lock() obj->key = key; -atomic_inc(&obj->refcnt); /* * we need to make sure obj->key is updated before obj->next + * or obj->refcnt */ smp_wmb(); +atomic_set(&obj->refcnt, 1); hlist_add_head_rcu(&obj->obj_node, list); unlock_chain(); // typically a spin_unlock() @@ -159,6 +160,10 @@ out: obj = kmem_cache_alloc(cachep); lock_chain(); // typically a spin_lock() obj->key = key; +/* + * changes to obj->key must be visible before refcnt one + */ +smp_wmb(); atomic_set(&obj->refcnt, 1); /* * insert obj in RCU way (readers might be traversing chain) |