git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
printk,kdb: capture printk() when in kdb shell
[safe/jmp/linux-2.6]
/
kernel
/
acct.c
diff --git
a/kernel/acct.c
b/kernel/acct.c
index
e4c0e1f
..
385b884
100644
(file)
--- a/
kernel/acct.c
+++ b/
kernel/acct.c
@@
-216,7
+216,6
@@
static int acct_on(char *name)
{
struct file *file;
struct vfsmount *mnt;
{
struct file *file;
struct vfsmount *mnt;
- int error;
struct pid_namespace *ns;
struct bsd_acct_struct *acct = NULL;
struct pid_namespace *ns;
struct bsd_acct_struct *acct = NULL;
@@
-244,13
+243,6
@@
static int acct_on(char *name)
}
}
}
}
- error = security_acct(file);
- if (error) {
- kfree(acct);
- filp_close(file, NULL);
- return error;
- }
-
spin_lock(&acct_lock);
if (ns->bacct == NULL) {
ns->bacct = acct;
spin_lock(&acct_lock);
if (ns->bacct == NULL) {
ns->bacct = acct;
@@
-281,7
+273,7
@@
static int acct_on(char *name)
*/
SYSCALL_DEFINE1(acct, const char __user *, name)
{
*/
SYSCALL_DEFINE1(acct, const char __user *, name)
{
- int error;
+ int error
= 0
;
if (!capable(CAP_SYS_PACCT))
return -EPERM;
if (!capable(CAP_SYS_PACCT))
return -EPERM;
@@
-299,13
+291,11
@@
SYSCALL_DEFINE1(acct, const char __user *, name)
if (acct == NULL)
return 0;
if (acct == NULL)
return 0;
- error = security_acct(NULL);
- if (!error) {
- spin_lock(&acct_lock);
- acct_file_reopen(acct, NULL, NULL);
- spin_unlock(&acct_lock);
- }
+ spin_lock(&acct_lock);
+ acct_file_reopen(acct, NULL, NULL);
+ spin_unlock(&acct_lock);
}
}
+
return error;
}
return error;
}