lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	net/ipv4/fib_frontend.c
This commit is contained in:
David S. Miller
2010-12-26 22:37:05 -08:00
parent 041110a439 d7c1255a3a
commit 17f7f4d9fc
1401 changed files with 22733 additions and 12093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
security/selinux/hooks.c
View File

@@ -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 */