diff --git a/[refs] b/[refs] index ddeac002a144..f879171a76be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4737250b751b4e0e802adae9a4d3ae0227b580b +refs/heads/master: dd4907a6d4e038dc65839fcd4030ebefe2f5f439 diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c index ec834dc0b414..03621928f1b2 100644 --- a/trunk/security/selinux/hooks.c +++ b/trunk/security/selinux/hooks.c @@ -2655,12 +2655,6 @@ static int selinux_inode_rmdir(struct inode *dir, struct dentry *dentry) static int selinux_inode_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev) { - int rc; - - rc = secondary_ops->inode_mknod(dir, dentry, mode, dev); - if (rc) - return rc; - return may_create(dir, dentry, inode_mode_to_security_class(mode)); }