diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-26 19:19:16 -0400 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-01-15 10:44:58 +0000 |
| commit | f185f12c4a26bf317e070697d3cf9ec17fc11864 (patch) | |
| tree | e496ca9019595603709e82cc557d003668351e69 /include | |
| parent | 55074679b401d834d999b8b71877065cfeaeef73 (diff) | |
| download | linux-stable-f185f12c4a26bf317e070697d3cf9ec17fc11864.tar.gz linux-stable-f185f12c4a26bf317e070697d3cf9ec17fc11864.tar.bz2 linux-stable-f185f12c4a26bf317e070697d3cf9ec17fc11864.zip | |
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.16:
- Apply name changes in all the different places we use d_alias and d_child
- Adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Moritz Muehlenhoff <jmm@inutil.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
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 3c7ec327ebd2..6cddc8708a95 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -124,15 +124,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 hlist_node d_alias; /* inode alias list */ struct rcu_head d_rcu; } d_u; - struct list_head d_subdirs; /* our children */ - struct hlist_node d_alias; /* inode alias list */ }; /* |