summaryrefslogtreecommitdiffstats
path: root/fs/dcache.c
diff options
context:
space:
mode:
authorHe Kuang <hekuang@huawei.com>2016-03-26 09:12:10 +0000
committerAl Viro <viro@zeniv.linux.org.uk>2016-06-30 23:30:35 -0400
commitae0a843c740b4e63684eefae96097cf62d9b7a14 (patch)
tree9969977bb9c255981b82501e9678cee997914161 /fs/dcache.c
parentc074cefcc0f75152bc74a1c4f2e7b662f09403d4 (diff)
downloadlinux-stable-ae0a843c740b4e63684eefae96097cf62d9b7a14.tar.gz
linux-stable-ae0a843c740b4e63684eefae96097cf62d9b7a14.tar.bz2
linux-stable-ae0a843c740b4e63684eefae96097cf62d9b7a14.zip
dentry_cmp(): use lockless_dereference() instead of smp_read_barrier_depends()
lockless_dereference() was added which can be used in place of hard-coding smp_read_barrier_depends(). Signed-off-by: He Kuang <hekuang@huawei.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/dcache.c')
-rw-r--r--fs/dcache.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/dcache.c b/fs/dcache.c
index e5c8ba76d426..dc37c0238b46 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -226,10 +226,9 @@ static inline int dentry_string_cmp(const unsigned char *cs, const unsigned char
static inline int dentry_cmp(const struct dentry *dentry, const unsigned char *ct, unsigned tcount)
{
- const unsigned char *cs;
/*
* Be careful about RCU walk racing with rename:
- * use ACCESS_ONCE to fetch the name pointer.
+ * use 'lockless_dereference' to fetch the name pointer.
*
* NOTE! Even if a rename will mean that the length
* was not loaded atomically, we don't care. The
@@ -243,8 +242,8 @@ static inline int dentry_cmp(const struct dentry *dentry, const unsigned char *c
* early because the data cannot match (there can
* be no NUL in the ct/tcount data)
*/
- cs = ACCESS_ONCE(dentry->d_name.name);
- smp_read_barrier_depends();
+ const unsigned char *cs = lockless_dereference(dentry->d_name.name);
+
return dentry_string_cmp(cs, ct, tcount);
}