diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-12-16 17:54:32 +0100 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-12-16 17:54:32 +0100 |
| commit | c4ffa146849099e9178d3fcfa48ba114d3d1e432 (patch) | |
| tree | 47121403e38aff376042f0f793c94c54ba935c06 /security/selinux/hooks.c | |
| parent | 82cc2e4b513e23a03df78b7f32ef957ef8180405 (diff) | |
| parent | e4ea0c16a85d221ebcc3a21f32e321440459e0fc (diff) | |
Merge branch 'for-2.6.38/core' into for-next
Diffstat (limited to 'security/selinux/hooks.c')
| -rw-r--r-- | security/selinux/hooks.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index d9154cf90ae..65fa8bf596f 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -1973,14 +1973,10 @@ static int selinux_quota_on(struct dentry *dentry) return dentry_has_perm(cred, NULL, dentry, FILE__QUOTAON); } -static int selinux_syslog(int type, bool from_file) +static int selinux_syslog(int type) { int rc; - rc = cap_syslog(type, from_file); - if (rc) - return rc; - switch (type) { case SYSLOG_ACTION_READ_ALL: /* Read last kernel messages */ case SYSLOG_ACTION_SIZE_BUFFER: /* Return size of the log buffer */ |