Skip to contentSkip to conversation

selinux: Change how dentry's d_lock field is accessed

PATCH Superseded Waiman Long 2 participants 2 messages Jul 3, 2013 – Jul 4, 2013

Subsystems (2)

v3 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 25/25 selinux: Change how dentry's d_lock field is accessed

Because of the changes made in dcache.h header file, files that use the d_lock field of the dentry structure need to be changed accordingly. All the d_lock's spin_lock() and spin_unlock() calls are replaced by the corresponding d_lock() and d_unlock() calls. There is no change in logic and everything should just work.

---
 security/selinux/selinuxfs.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
security/selinux/selinuxfs.c +7 -7
index ff42773..c83a201 100644
@@ -1187,28 +1187,28 @@ static void sel_remove_entries(struct dentry *de)
 {
 	struct list_head *node;
 
-	spin_lock(&de->d_lock);
+	d_lock(de);
 	node = de->d_subdirs.next;
 	while (node != &de->d_subdirs) {
 		struct dentry *d = list_entry(node, struct dentry, d_u.d_child);
 
-		spin_lock_nested(&d->d_lock, DENTRY_D_LOCK_NESTED);
+		d_lock_nested(d, DENTRY_D_LOCK_NESTED);
 		list_del_init(node);
 
 		if (d->d_inode) {
 			dget_dlock(d);
-			spin_unlock(&de->d_lock);
-			spin_unlock(&d->d_lock);
+			d_unlock(de);
+			d_unlock(d);
 			d_delete(d);
 			simple_unlink(de->d_inode, d);
 			dput(d);
-			spin_lock(&de->d_lock);
+			d_lock(de);
 		} else
-			spin_unlock(&d->d_lock);
+			d_unlock(d);
 		node = de->d_subdirs.next;
 	}
 
-	spin_unlock(&de->d_lock);
+	d_unlock(de);
 }
 
 #define BOOL_DIR_NAME "booleans"
Signature · 1 line
1.7.1
maintainer
#1 lore raw
Quoted 27 lines · Waiman Long
security/selinux/selinuxfs.c +4 -4
index ff42773..c83a201 100644
@@ -1187,28 +1187,28 @@ static void sel_remove_entries(struct dentry *de)
 {
 	struct list_head *node;
 
-	spin_lock(&de->d_lock);
+	d_lock(de);
 	node = de->d_subdirs.next;
 	while (node != &de->d_subdirs) {
 		struct dentry *d = list_entry(node, struct dentry, d_u.d_child);
 
-		spin_lock_nested(&d->d_lock, DENTRY_D_LOCK_NESTED);
+		d_lock_nested(d, DENTRY_D_LOCK_NESTED);
 		list_del_init(node);
 
 		if (d->d_inode) {
 			dget_dlock(d);
-			spin_unlock(&de->d_lock);
-			spin_unlock(&d->d_lock);
+			d_unlock(de);
+			d_unlock(d);
 			d_delete(d);
 			simple_unlink(de->d_inode, d);
 			dput(d);

security/selinux/selinuxfs.c static void sel_remove_entries(struct dentry *de) · line 1211

Quoted 10 lines
security/selinux/selinuxfs.c +3 -3
-			spin_lock(&de->d_lock);
+			d_lock(de);
 		} else
-			spin_unlock(&d->d_lock);
+			d_unlock(d);
 		node = de->d_subdirs.next;
 	}
 
-	spin_unlock(&de->d_lock);
+	d_unlock(de);

BTW, all that bunch (this and similar simple_unlink() callers) is seriously asking for a common helper somewhere in libfs.c; I'd started experimenting in that direction several times, but got sidetracked. The real question here is what do we do with the stuff mounted on those.

Linus, do you have any suggestions re semantics of mounts on such mountpoints? I see two variants - disslove all mounts on those when the kernel decides to kill such a volatile mountpoint (the same goes for e.g. /proc/42/fd getting invalidated, etc.) or ban mounting on them in the first place (i.e. set DCACHE_CANT_MOUNT when these dentries are created)... Preferences, alternative suggestions?