diff options
author | Pranith Kumar <bobby.prani@gmail.com> | 2014-12-10 15:42:28 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 17:41:04 -0800 |
commit | 8df0c2dcf61781d2efa8e6e5b06870f6c6785735 (patch) | |
tree | 69f8d7dcfde84ba42315db10862dfb197668b5bb | |
parent | c871ac4e9666ad68ae861172ef8a7f73d6e61b26 (diff) | |
download | linux-stable-8df0c2dcf61781d2efa8e6e5b06870f6c6785735.tar.gz linux-stable-8df0c2dcf61781d2efa8e6e5b06870f6c6785735.tar.bz2 linux-stable-8df0c2dcf61781d2efa8e6e5b06870f6c6785735.zip |
slab: replace smp_read_barrier_depends() with lockless_dereference()
Recently lockless_dereference() was added which can be used in place of
hard-coding smp_read_barrier_depends(). The following PATCH makes the
change.
Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
Cc: "Paul E. McKenney" <paulmck@us.ibm.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | mm/slab.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/slab.h b/mm/slab.h index 53a55c70c409..078acbcf64e8 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -209,15 +209,15 @@ cache_from_memcg_idx(struct kmem_cache *s, int idx) rcu_read_lock(); params = rcu_dereference(s->memcg_params); - cachep = params->memcg_caches[idx]; - rcu_read_unlock(); /* * Make sure we will access the up-to-date value. The code updating * memcg_caches issues a write barrier to match this (see * memcg_register_cache()). */ - smp_read_barrier_depends(); + cachep = lockless_dereference(params->memcg_caches[idx]); + rcu_read_unlock(); + return cachep; } |