diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-26 19:19:16 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-01-01 01:27:50 +0000 |
| commit | 026181647a6262f4ba6d60c0847d306ad685468c (patch) | |
| tree | 6254d3a8adc41c4d18c455067d3e8962c0e1b48a /include | |
| parent | 060d11323f35afb752a7ba6c5bead732c204de55 (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>
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 1dfe974fb9fd..99374de00c14 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -133,15 +133,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 */ }; /* |