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

5 files changed, 18 insertions, 52 deletions

diff --git a/kernel/exit.c b/kernel/exit.c
index 0caf590548a0..eb4d6470d1d0 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -121,18 +121,7 @@ static void __exit_signal(struct task_struct *tsk)
                 sig->nivcsw += tsk->nivcsw;
                 sig->inblock += task_io_get_inblock(tsk);
                 sig->oublock += task_io_get_oublock(tsk);
-#ifdef CONFIG_TASK_XACCT
-                sig->rchar += tsk->rchar;
-                sig->wchar += tsk->wchar;
-                sig->syscr += tsk->syscr;
-                sig->syscw += tsk->syscw;
-#endif /* CONFIG_TASK_XACCT */
-#ifdef CONFIG_TASK_IO_ACCOUNTING
-                sig->ioac.read_bytes += tsk->ioac.read_bytes;
-                sig->ioac.write_bytes += tsk->ioac.write_bytes;
-                sig->ioac.cancelled_write_bytes +=
-                                        tsk->ioac.cancelled_write_bytes;
-#endif /* CONFIG_TASK_IO_ACCOUNTING */
+                task_io_accounting_add(&sig->ioac, &tsk->ioac);
                 sig->sum_sched_runtime += tsk->se.sum_exec_runtime;
                 sig = NULL; /* Marker for below. */
         }
@@ -1363,21 +1352,8 @@ static int wait_task_zombie(struct task_struct *p, int options,
                 psig->coublock +=
                         task_io_get_oublock(p) +
                         sig->oublock + sig->coublock;
-#ifdef CONFIG_TASK_XACCT
-                psig->rchar += p->rchar + sig->rchar;
-                psig->wchar += p->wchar + sig->wchar;
-                psig->syscr += p->syscr + sig->syscr;
-                psig->syscw += p->syscw + sig->syscw;
-#endif /* CONFIG_TASK_XACCT */
-#ifdef CONFIG_TASK_IO_ACCOUNTING
-                psig->ioac.read_bytes +=
-                        p->ioac.read_bytes + sig->ioac.read_bytes;
-                psig->ioac.write_bytes +=
-                        p->ioac.write_bytes + sig->ioac.write_bytes;
-                psig->ioac.cancelled_write_bytes +=
-                                p->ioac.cancelled_write_bytes +
-                                sig->ioac.cancelled_write_bytes;
-#endif /* CONFIG_TASK_IO_ACCOUNTING */
+                task_io_accounting_add(&psig->ioac, &p->ioac);
+                task_io_accounting_add(&psig->ioac, &sig->ioac);
                 spin_unlock_irq(&p->parent->sighand->siglock);
         }
 
diff --git a/kernel/fork.c b/kernel/fork.c
index 5e050c1317c4..8214ba7c8bb1 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -806,12 +806,7 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
         sig->nvcsw = sig->nivcsw = sig->cnvcsw = sig->cnivcsw = 0;
         sig->min_flt = sig->maj_flt = sig->cmin_flt = sig->cmaj_flt = 0;
         sig->inblock = sig->oublock = sig->cinblock = sig->coublock = 0;
-#ifdef CONFIG_TASK_XACCT
-        sig->rchar = sig->wchar = sig->syscr = sig->syscw = 0;
-#endif
-#ifdef CONFIG_TASK_IO_ACCOUNTING
-        memset(&sig->ioac, 0, sizeof(sig->ioac));
-#endif
+        task_io_accounting_init(&sig->ioac);
         sig->sum_sched_runtime = 0;
         INIT_LIST_HEAD(&sig->cpu_timers[0]);
         INIT_LIST_HEAD(&sig->cpu_timers[1]);
@@ -994,13 +989,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
         p->last_switch_timestamp = 0;
 #endif
 
-#ifdef CONFIG_TASK_XACCT
-        p->rchar = 0;           /* I/O counter: bytes read */
-        p->wchar = 0;           /* I/O counter: bytes written */
-        p->syscr = 0;           /* I/O counter: read syscalls */
-        p->syscw = 0;           /* I/O counter: write syscalls */
-#endif
-        task_io_accounting_init(p);
+        task_io_accounting_init(&p->ioac);
         acct_clear_integrals(p);
 
         p->it_virt_expires = cputime_zero;
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 911d846f0503..fe4713347275 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1680,43 +1680,45 @@ static __init int sysctl_init(void)
 
 core_initcall(sysctl_init);
 
-static int is_branch_in(struct ctl_table *branch, struct ctl_table *table)
+static struct ctl_table *is_branch_in(struct ctl_table *branch,
+                                      struct ctl_table *table)
 {
         struct ctl_table *p;
         const char *s = branch->procname;
 
         /* branch should have named subdirectory as its first element */
         if (!s || !branch->child)
-                return 0;
+                return NULL;
 
         /* ... and nothing else */
         if (branch[1].procname || branch[1].ctl_name)
-                return 0;
+                return NULL;
 
         /* table should contain subdirectory with the same name */
         for (p = table; p->procname || p->ctl_name; p++) {
                 if (!p->child)
                         continue;
                 if (p->procname && strcmp(p->procname, s) == 0)
-                        return 1;
+                        return p;
         }
-        return 0;
+        return NULL;
 }
 
 /* see if attaching q to p would be an improvement */
 static void try_attach(struct ctl_table_header *p, struct ctl_table_header *q)
 {
         struct ctl_table *to = p->ctl_table, *by = q->ctl_table;
+        struct ctl_table *next;
         int is_better = 0;
         int not_in_parent = !p->attached_by;
 
-        while (is_branch_in(by, to)) {
+        while ((next = is_branch_in(by, to)) != NULL) {
                 if (by == q->attached_by)
                         is_better = 1;
                 if (to == p->attached_by)
                         not_in_parent = 1;
                 by = by->child;
-                to = to->child;
+                to = next->child;
         }
 
         if (is_better && not_in_parent) {
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index fc20e09a6cb1..8f3fb3db61c3 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1183,7 +1183,6 @@ static void *find_next_entry_inc(struct trace_iterator *iter)
 static void *s_next(struct seq_file *m, void *v, loff_t *pos)
 {
         struct trace_iterator *iter = m->private;
-        void *last_ent = iter->ent;
         int i = (int)*pos;
         void *ent;
 
diff --git a/kernel/tsacct.c b/kernel/tsacct.c
index 3da47ccdc5e5..8ebcd8532dfb 100644
--- a/kernel/tsacct.c
+++ b/kernel/tsacct.c
@@ -94,10 +94,10 @@ void xacct_add_tsk(struct taskstats *stats, struct task_struct *p)
                 stats->hiwater_vm    = mm->hiwater_vm * PAGE_SIZE / KB;
                 mmput(mm);
         }
-        stats->read_char        = p->rchar;
-        stats->write_char       = p->wchar;
-        stats->read_syscalls    = p->syscr;
-        stats->write_syscalls   = p->syscw;
+        stats->read_char        = p->ioac.rchar;
+        stats->write_char       = p->ioac.wchar;
+        stats->read_syscalls    = p->ioac.syscr;
+        stats->write_syscalls   = p->ioac.syscw;
 #ifdef CONFIG_TASK_IO_ACCOUNTING
         stats->read_bytes       = p->ioac.read_bytes;
         stats->write_bytes      = p->ioac.write_bytes;