History

devcgroup_inode_permission: take "is it a device node" checks to inlined wrapper

inode_permission() calls devcgroup_inode_permission() and almost all such calls are _not_ for device nodes; let's at least keep the common path straight...

Al Viro committed 15 years ago

Commit 482e0cd1 parent 8e833fd2 files · +10 −8Browse files

Showing the changes to include/linux (1 of 2 files). Show all

Unified · Split

include/linux/device_cgroup.h+9−1
@@ -2,8 +2,16 @@ · 1 unmodified line
2#include <linux/fs.h>2#include <linux/fs.h>
3 3
4#ifdef CONFIG_CGROUP_DEVICE4#ifdef CONFIG_CGROUP_DEVICE
5extern int devcgroup_inode_permission(struct inode *inode, int mask);5extern int __devcgroup_inode_permission(struct inode *inode, int mask);
6extern int devcgroup_inode_mknod(int mode, dev_t dev);6extern int devcgroup_inode_mknod(int mode, dev_t dev);
7static inline int devcgroup_inode_permission(struct inode *inode, int mask)
8{
9 if (likely(!inode->i_rdev))
10 return 0;
11 if (!S_ISBLK(inode->i_mode) && !S_ISCHR(inode->i_mode))
12 return 0;
13 return __devcgroup_inode_permission(inode, mask);
14}
7#else15#else
8static inline int devcgroup_inode_permission(struct inode *inode, int mask)16static inline int devcgroup_inode_permission(struct inode *inode, int mask)
9{ return 0; }17{ return 0; }