diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-26 19:19:16 -0400 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2015-04-14 17:33:58 +0800 |
| commit | 6fd17def6d964c81205230e02b4208c653106d51 (patch) | |
| tree | 1253f07591fe80dc3442db927536c1b3f66b5cd7 /include | |
| parent | a42e15a485c14f6d994192af4c16775fbd6c1126 (diff) | |
move d_rcu from overlapping d_child to overlapping d_alias
commit 946e51f2bf37f1656916eb75bd0742ba33983c28 upstream.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
[bwh: Backported to 3.2:
- Apply name changes in all the different places we use d_alias and d_child
- Move the WARN_ON() in __d_free() to d_free() as we don't have dentry_free()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
[lizf: Backported to 3.4:
- adjust context
- need one more name change in debugfs]
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dcache.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 1332df02d8f2..31e55bf1df6d 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -105,15 +105,15 @@ struct dentry { void *d_fsdata; /* fs-specific data */ struct list_head d_lru; /* LRU list */ + struct list_head d_child; /* child of parent list */ + struct list_head d_subdirs; /* our children */ /* - * d_child and d_rcu can share memory + * d_alias and d_rcu can share memory */ union { - struct list_head d_child; /* child of parent list */ + struct list_head d_alias; /* inode alias list */ struct rcu_head d_rcu; } d_u; - struct list_head d_subdirs; /* our children */ - struct list_head d_alias; /* inode alias list */ }; /* |