Merge master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

[linux.git] / kernel / delayacct.c

diff --git a/kernel/delayacct.c b/kernel/delayacct.c
index f05392d64267eafddf4d86a8c99a62233782b7fa..766d5912b26a4533edd2b07ac767dd36db581ca3 100644 (file)
--- a/kernel/delayacct.c
+++ b/kernel/delayacct.c
@@ -19,15 +19,15 @@
 #include <linux/sysctl.h>
 #include <linux/delayacct.h>
 
-int delayacct_on __read_mostly;        /* Delay accounting turned on/off */
-kmem_cache_t *delayacct_cache;
+int delayacct_on __read_mostly = 1;    /* Delay accounting turned on/off */
+struct kmem_cache *delayacct_cache;
 
-static int __init delayacct_setup_enable(char *str)
+static int __init delayacct_setup_disable(char *str)
 {
-       delayacct_on = 1;
+       delayacct_on = 0;
        return 1;
 }
-__setup("delayacct", delayacct_setup_enable);
+__setup("nodelayacct", delayacct_setup_disable);
 
 void delayacct_init(void)
 {
@@ -41,24 +41,11 @@ void delayacct_init(void)
 
 void __delayacct_tsk_init(struct task_struct *tsk)
 {
-       spin_lock_init(&tsk->delays_lock);
-       /* No need to acquire tsk->delays_lock for allocation here unless
-          __delayacct_tsk_init called after tsk is attached to tasklist
-       */
-       tsk->delays = kmem_cache_zalloc(delayacct_cache, SLAB_KERNEL);
+       tsk->delays = kmem_cache_zalloc(delayacct_cache, GFP_KERNEL);
        if (tsk->delays)
                spin_lock_init(&tsk->delays->lock);
 }
 
-void __delayacct_tsk_exit(struct task_struct *tsk)
-{
-       struct task_delay_info *delays = tsk->delays;
-       spin_lock(&tsk->delays_lock);
-       tsk->delays = NULL;
-       spin_unlock(&tsk->delays_lock);
-       kmem_cache_free(delayacct_cache, delays);
-}
-
 /*
  * Start accounting for a delay statistic using
  * its starting timestamp (@start)
@@ -79,6 +66,7 @@ static void delayacct_end(struct timespec *start, struct timespec *end,
 {
        struct timespec ts;
        s64 ns;
+       unsigned long flags;
 
        do_posix_clock_monotonic_gettime(end);
        ts = timespec_sub(*end, *start);
@@ -86,10 +74,10 @@ static void delayacct_end(struct timespec *start, struct timespec *end,
        if (ns < 0)
                return;
 
-       spin_lock(&current->delays->lock);
+       spin_lock_irqsave(&current->delays->lock, flags);
        *total += ns;
        (*count)++;
-       spin_unlock(&current->delays->lock);
+       spin_unlock_irqrestore(&current->delays->lock, flags);
 }
 
 void __delayacct_blkio_start(void)
@@ -117,8 +105,7 @@ int __delayacct_add_tsk(struct taskstats *d, struct task_struct *tsk)
        s64 tmp;
        struct timespec ts;
        unsigned long t1,t2,t3;
-
-       spin_lock(&tsk->delays_lock);
+       unsigned long flags;
 
        /* Though tsk->delays accessed later, early exit avoids
         * unnecessary returning of other data
@@ -151,28 +138,28 @@ int __delayacct_add_tsk(struct taskstats *d, struct task_struct *tsk)
 
        /* zero XXX_total, non-zero XXX_count implies XXX stat overflowed */
 
-       spin_lock(&tsk->delays->lock);
+       spin_lock_irqsave(&tsk->delays->lock, flags);
        tmp = d->blkio_delay_total + tsk->delays->blkio_delay;
        d->blkio_delay_total = (tmp < d->blkio_delay_total) ? 0 : tmp;
        tmp = d->swapin_delay_total + tsk->delays->swapin_delay;
        d->swapin_delay_total = (tmp < d->swapin_delay_total) ? 0 : tmp;
        d->blkio_count += tsk->delays->blkio_count;
        d->swapin_count += tsk->delays->swapin_count;
-       spin_unlock(&tsk->delays->lock);
+       spin_unlock_irqrestore(&tsk->delays->lock, flags);
 
 done:
-       spin_unlock(&tsk->delays_lock);
        return 0;
 }
 
 __u64 __delayacct_blkio_ticks(struct task_struct *tsk)
 {
        __u64 ret;
+       unsigned long flags;
 
-       spin_lock(&tsk->delays->lock);
+       spin_lock_irqsave(&tsk->delays->lock, flags);
        ret = nsec_to_clock_t(tsk->delays->blkio_delay +
                                tsk->delays->swapin_delay);
-       spin_unlock(&tsk->delays->lock);
+       spin_unlock_irqrestore(&tsk->delays->lock, flags);
        return ret;
 }