Since the new lsm-based cgroup device access control is settled, the explicit calls to devcgroup_inode_permission and devcgroup_inode_mknod in fs/namei.c are redundant and can safely be dropped. The corresponding security_inode_permission and security_inode_mknod hooks are taking over. Signed-off-by: Michael Weiß <michael.weiss@xxxxxxxxxxxxxxxxxxx> --- fs/namei.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 567ee547492b..f601fcbdc4d2 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -34,7 +34,6 @@ #include <linux/capability.h> #include <linux/file.h> #include <linux/fcntl.h> -#include <linux/device_cgroup.h> #include <linux/fs_struct.h> #include <linux/posix_acl.h> #include <linux/hash.h> @@ -529,10 +528,6 @@ int inode_permission(struct mnt_idmap *idmap, if (retval) return retval; - retval = devcgroup_inode_permission(inode, mask); - if (retval) - return retval; - return security_inode_permission(inode, mask); } EXPORT_SYMBOL(inode_permission); @@ -3987,9 +3982,6 @@ int vfs_mknod(struct mnt_idmap *idmap, struct inode *dir, return -EPERM; mode = vfs_prepare_mode(idmap, dir, mode, mode, mode); - error = devcgroup_inode_mknod(mode, dev); - if (error) - return error; error = security_inode_mknod(dir, dentry, mode, dev); if (error) -- 2.30.2
