kernel/acct.c: fix coding style warnings and errors

Signed-off-by: Ionut Alexa <ionut.m.alexa@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Ionut Alexa
2014-07-31 09:28:36 +10:00
committed by Al Viro
parent 3064c3563b
commit 2577d92ebd

View File

@@ -108,14 +108,14 @@ static int check_free_space(struct bsd_acct_struct *acct)
do_div(suspend, 100); do_div(suspend, 100);
if (sbuf.f_bavail <= suspend) { if (sbuf.f_bavail <= suspend) {
acct->active = 0; acct->active = 0;
printk(KERN_INFO "Process accounting paused\n"); pr_info("Process accounting paused\n");
} }
} else { } else {
u64 resume = sbuf.f_blocks * RESUME; u64 resume = sbuf.f_blocks * RESUME;
do_div(resume, 100); do_div(resume, 100);
if (sbuf.f_bavail >= resume) { if (sbuf.f_bavail >= resume) {
acct->active = 1; acct->active = 1;
printk(KERN_INFO "Process accounting resumed\n"); pr_info("Process accounting resumed\n");
} }
} }
@@ -280,6 +280,7 @@ SYSCALL_DEFINE1(acct, const char __user *, name)
if (name) { if (name) {
struct filename *tmp = getname(name); struct filename *tmp = getname(name);
if (IS_ERR(tmp)) if (IS_ERR(tmp))
return PTR_ERR(tmp); return PTR_ERR(tmp);
mutex_lock(&acct_on_mutex); mutex_lock(&acct_on_mutex);
@@ -390,7 +391,8 @@ static u32 encode_float(u64 value)
unsigned exp = 190; unsigned exp = 190;
unsigned u; unsigned u;
if (value==0) return 0; if (value == 0)
return 0;
while ((s64)value > 0) { while ((s64)value > 0) {
value <<= 1; value <<= 1;
exp--; exp--;
@@ -439,6 +441,7 @@ static void fill_ac(acct_t *ac)
{ {
/* new enlarged etime field */ /* new enlarged etime field */
comp2_t etime = encode_comp2_t(elapsed); comp2_t etime = encode_comp2_t(elapsed);
ac->ac_etime_hi = etime >> 16; ac->ac_etime_hi = etime >> 16;
ac->ac_etime_lo = (u16) etime; ac->ac_etime_lo = (u16) etime;
} }
@@ -530,6 +533,7 @@ void acct_collect(long exitcode, int group_dead)
if (group_dead && current->mm) { if (group_dead && current->mm) {
struct vm_area_struct *vma; struct vm_area_struct *vma;
down_read(&current->mm->mmap_sem); down_read(&current->mm->mmap_sem);
vma = current->mm->mmap; vma = current->mm->mmap;
while (vma) { while (vma) {