diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-02-29 12:12:46 -0500 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-03-09 13:15:20 -0500 |
| commit | c8ce76e3c6cd937e8b3fd8ae3573f23767b70eca (patch) | |
| tree | 07ab627f7d958549def9388a077e003c400c1b62 /include/linux | |
| parent | 4950beba6231d72c54aa5f52d96487fdda8292ed (diff) | |
use ->d_seq to get coherency between ->d_inode and ->d_flags
[ Upstream commit a528aca7f359f4b0b1d72ae406097e491a5ba9ea ]
Games with ordering and barriers are way too brittle. Just
bump ->d_seq before and after updating ->d_inode and ->d_flags
type bits, so that verifying ->d_seq would guarantee they are
coherent.
Cc: stable@vger.kernel.org # v3.13+
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dcache.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 167ec0934049..ca9df4521734 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -408,9 +408,7 @@ static inline bool d_mountpoint(const struct dentry *dentry) */ static inline unsigned __d_entry_type(const struct dentry *dentry) { - unsigned type = READ_ONCE(dentry->d_flags); - smp_rmb(); - return type & DCACHE_ENTRY_TYPE; + return dentry->d_flags & DCACHE_ENTRY_TYPE; } static inline bool d_is_miss(const struct dentry *dentry) |