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.
Signed-off-by: Waiman Long <[email protected]> --- security/selinux/selinuxfs.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index ff42773..c83a201 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c @@ -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" -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
