UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

bsdacct: make check timer accept a bsd_acct_struct argument 

We're going to have many bsd_acct_struct instances, not just one, so the
timer (currently working with a global one) has to know which one to work
with.

Use a handy setup_timer macro for it (thanks to Oleg for one).

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Cc: Balbir Singh <balbir@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Pavel Emelyanov 2008-07-25 01:48:44 -07:00 committed by Linus Torvalds
parent 1c552858ac
commit e59a04a7aa
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/acct.c
View File

@ -97,9 +97,10 @@ static struct bsd_acct_struct acct_globals __cacheline_aligned =
/*
* Called whenever the timer says to check the free space.
*/
static void acct_timeout(unsigned long unused)
static void acct_timeout(unsigned long x)
{
acct_globals.needcheck = 1;
struct bsd_acct_struct *acct = (struct bsd_acct_struct *)x;
acct->needcheck = 1;
}
/*
@ -193,8 +194,8 @@ static void acct_file_reopen(struct file *file)
acct_globals.needcheck = 0;
acct_globals.active = 1;
/* It's been deleted if it was used before so this is safe */
init_timer(&acct_globals.timer);
acct_globals.timer.function = acct_timeout;
setup_timer(&acct_globals.timer, acct_timeout,
(unsigned long)&acct_globals);
acct_globals.timer.expires = jiffies + ACCT_TIMEOUT*HZ;
add_timer(&acct_globals.timer);
}