Merge tag 'f2fs-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs

[linux.git] / include / linux / device_cgroup.h

diff --git a/include/linux/device_cgroup.h b/include/linux/device_cgroup.h
index 8557efe096dc96018525b8ba62790a104a21b888..fa35b52e0002e03a4a2476f2f854daade6e6742d 100644 (file)
--- a/include/linux/device_cgroup.h
+++ b/include/linux/device_cgroup.h
@@ -12,26 +12,15 @@
 #define DEVCG_DEV_ALL   4  /* this represents all devices */
 
 #ifdef CONFIG_CGROUP_DEVICE
-extern int __devcgroup_check_permission(short type, u32 major, u32 minor,
-                                       short access);
+int devcgroup_check_permission(short type, u32 major, u32 minor,
+                              short access);
 #else
-static inline int __devcgroup_check_permission(short type, u32 major, u32 minor,
-                                              short access)
+static inline int devcgroup_check_permission(short type, u32 major, u32 minor,
+                                            short access)
 { return 0; }
 #endif
 
 #if defined(CONFIG_CGROUP_DEVICE) || defined(CONFIG_CGROUP_BPF)
-static inline int devcgroup_check_permission(short type, u32 major, u32 minor,
-                                            short access)
-{
-       int rc = BPF_CGROUP_RUN_PROG_DEVICE_CGROUP(type, major, minor, access);
-
-       if (rc)
-               return -EPERM;
-
-       return __devcgroup_check_permission(type, major, minor, access);
-}
-
 static inline int devcgroup_inode_permission(struct inode *inode, int mask)
 {
        short type, access = 0;