aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux
diff options
context:
space:
mode:
authorNick Piggin <npiggin@kernel.dk>2011-01-07 01:49:38 -0500
committerNick Piggin <npiggin@kernel.dk>2011-01-07 01:50:23 -0500
commitb5c84bf6f6fa3a7dfdcb556023a62953574b60ee (patch)
tree7a2c299a180713e21d5cb653cb933121adf53c31 /security/selinux
parent949854d02455080d20cd3e1db28a3a18daf7599d (diff)
fs: dcache remove dcache_lock
dcache_lock no longer protects anything. remove it. Signed-off-by: Nick Piggin <npiggin@kernel.dk>
Diffstat (limited to 'security/selinux')
-rw-r--r--security/selinux/selinuxfs.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 017ec096446e..2285d693f296 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -1145,7 +1145,6 @@ static void sel_remove_entries(struct dentry *de)
1145{ 1145{
1146 struct list_head *node; 1146 struct list_head *node;
1147 1147
1148 spin_lock(&dcache_lock);
1149 spin_lock(&de->d_lock); 1148 spin_lock(&de->d_lock);
1150 node = de->d_subdirs.next; 1149 node = de->d_subdirs.next;
1151 while (node != &de->d_subdirs) { 1150 while (node != &de->d_subdirs) {
@@ -1158,11 +1157,9 @@ static void sel_remove_entries(struct dentry *de)
1158 dget_locked_dlock(d); 1157 dget_locked_dlock(d);
1159 spin_unlock(&de->d_lock); 1158 spin_unlock(&de->d_lock);
1160 spin_unlock(&d->d_lock); 1159 spin_unlock(&d->d_lock);
1161 spin_unlock(&dcache_lock);
1162 d_delete(d); 1160 d_delete(d);
1163 simple_unlink(de->d_inode, d); 1161 simple_unlink(de->d_inode, d);
1164 dput(d); 1162 dput(d);
1165 spin_lock(&dcache_lock);
1166 spin_lock(&de->d_lock); 1163 spin_lock(&de->d_lock);
1167 } else 1164 } else
1168 spin_unlock(&d->d_lock); 1165 spin_unlock(&d->d_lock);
@@ -1170,7 +1167,6 @@ static void sel_remove_entries(struct dentry *de)
1170 } 1167 }
1171 1168
1172 spin_unlock(&de->d_lock); 1169 spin_unlock(&de->d_lock);
1173 spin_unlock(&dcache_lock);
1174} 1170}
1175 1171
1176#define BOOL_DIR_NAME "booleans" 1172#define BOOL_DIR_NAME "booleans"