aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-10-26 19:19:16 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-11-03 15:20:29 -0500
commit946e51f2bf37f1656916eb75bd0742ba33983c28 (patch)
treee3d2672edeec1117ceda1e8e195eaa8d1c0f5135 /security/selinux
parenta7400222e3eb7d5ce3820d2234905bbeafabd171 (diff)
move d_rcu from overlapping d_child to overlapping d_alias
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security/selinux')
-rw-r--r--security/selinux/selinuxfs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index c71737f6d1cc..33db1ad4fd10 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -1200,7 +1200,7 @@ static void sel_remove_entries(struct dentry *de)
1200 spin_lock(&de->d_lock); 1200 spin_lock(&de->d_lock);
1201 node = de->d_subdirs.next; 1201 node = de->d_subdirs.next;
1202 while (node != &de->d_subdirs) { 1202 while (node != &de->d_subdirs) {
1203 struct dentry *d = list_entry(node, struct dentry, d_u.d_child); 1203 struct dentry *d = list_entry(node, struct dentry, d_child);
1204 1204
1205 spin_lock_nested(&d->d_lock, DENTRY_D_LOCK_NESTED); 1205 spin_lock_nested(&d->d_lock, DENTRY_D_LOCK_NESTED);
1206 list_del_init(node); 1206 list_del_init(node);
@@ -1674,12 +1674,12 @@ static void sel_remove_classes(void)
1674 1674
1675 list_for_each(class_node, &class_dir->d_subdirs) { 1675 list_for_each(class_node, &class_dir->d_subdirs) {
1676 struct dentry *class_subdir = list_entry(class_node, 1676 struct dentry *class_subdir = list_entry(class_node,
1677 struct dentry, d_u.d_child); 1677 struct dentry, d_child);
1678 struct list_head *class_subdir_node; 1678 struct list_head *class_subdir_node;
1679 1679
1680 list_for_each(class_subdir_node, &class_subdir->d_subdirs) { 1680 list_for_each(class_subdir_node, &class_subdir->d_subdirs) {
1681 struct dentry *d = list_entry(class_subdir_node, 1681 struct dentry *d = list_entry(class_subdir_node,
1682 struct dentry, d_u.d_child); 1682 struct dentry, d_child);
1683 1683
1684 if (d->d_inode) 1684 if (d->d_inode)
1685 if (d->d_inode->i_mode & S_IFDIR) 1685 if (d->d_inode->i_mode & S_IFDIR)