Skip to content

Commit

Permalink
dentry_cmp(): use lockless_dereference() instead of smp_read_barrier_…
Browse files Browse the repository at this point in the history
…depends()

lockless_dereference() was added which can be used in place of
hard-coding smp_read_barrier_depends().

Signed-off-by: He Kuang <[email protected]>
Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
He Kuang authored and Al Viro committed Jul 1, 2016
1 parent c074cef commit ae0a843
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions fs/dcache.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
}

Expand Down

0 comments on commit ae0a843

Please sign in to comment.