Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[safe/jmp/linux-2.6] / kernel / res_counter.c

diff --git a/kernel/res_counter.c b/kernel/res_counter.c
index 722c484..f275c8e 100644 (file)
--- a/kernel/res_counter.c
+++ b/kernel/res_counter.c
@@ -10,13 +10,15 @@
 #include <linux/types.h>
 #include <linux/parser.h>
 #include <linux/fs.h>
+#include <linux/slab.h>
 #include <linux/res_counter.h>
 #include <linux/uaccess.h>
+#include <linux/mm.h>
 
 void res_counter_init(struct res_counter *counter)
 {
        spin_lock_init(&counter->lock);
-       counter->limit = (unsigned long)LONG_MAX;
+       counter->limit = (unsigned long long)LLONG_MAX;
 }
 
 int res_counter_charge_locked(struct res_counter *counter, unsigned long val)
@@ -27,6 +29,8 @@ int res_counter_charge_locked(struct res_counter *counter, unsigned long val)
        }
 
        counter->usage += val;
+       if (counter->usage > counter->max_usage)
+               counter->max_usage = counter->usage;
        return 0;
 }
 
@@ -59,12 +63,14 @@ void res_counter_uncharge(struct res_counter *counter, unsigned long val)
 }
 
 
-static inline unsigned long *res_counter_member(struct res_counter *counter,
-                                               int member)
+static inline unsigned long long *
+res_counter_member(struct res_counter *counter, int member)
 {
        switch (member) {
        case RES_USAGE:
                return &counter->usage;
+       case RES_MAX_USAGE:
+               return &counter->max_usage;
        case RES_LIMIT:
                return &counter->limit;
        case RES_FAILCNT:
@@ -76,45 +82,58 @@ static inline unsigned long *res_counter_member(struct res_counter *counter,
 }
 
 ssize_t res_counter_read(struct res_counter *counter, int member,
-               const char __user *userbuf, size_t nbytes, loff_t *pos)
+               const char __user *userbuf, size_t nbytes, loff_t *pos,
+               int (*read_strategy)(unsigned long long val, char *st_buf))
 {
-       unsigned long *val;
+       unsigned long long *val;
        char buf[64], *s;
 
        s = buf;
        val = res_counter_member(counter, member);
-       s += sprintf(s, "%lu\n", *val);
+       if (read_strategy)
+               s += read_strategy(*val, s);
+       else
+               s += sprintf(s, "%llu\n", *val);
        return simple_read_from_buffer((void __user *)userbuf, nbytes,
                        pos, buf, s - buf);
 }
 
-ssize_t res_counter_write(struct res_counter *counter, int member,
-               const char __user *userbuf, size_t nbytes, loff_t *pos)
+u64 res_counter_read_u64(struct res_counter *counter, int member)
 {
-       int ret;
-       char *buf, *end;
-       unsigned long tmp, *val;
-
-       buf = kmalloc(nbytes + 1, GFP_KERNEL);
-       ret = -ENOMEM;
-       if (buf == NULL)
-               goto out;
-
-       buf[nbytes] = '\0';
-       ret = -EFAULT;
-       if (copy_from_user(buf, userbuf, nbytes))
-               goto out_free;
+       return *res_counter_member(counter, member);
+}
 
-       ret = -EINVAL;
-       tmp = simple_strtoul(buf, &end, 10);
+int res_counter_memparse_write_strategy(const char *buf,
+                                       unsigned long long *res)
+{
+       char *end;
+       /* FIXME - make memparse() take const char* args */
+       *res = memparse((char *)buf, &end);
        if (*end != '\0')
-               goto out_free;
+               return -EINVAL;
+
+       *res = PAGE_ALIGN(*res);
+       return 0;
+}
 
+int res_counter_write(struct res_counter *counter, int member,
+                     const char *buf, write_strategy_fn write_strategy)
+{
+       char *end;
+       unsigned long flags;
+       unsigned long long tmp, *val;
+
+       if (write_strategy) {
+               if (write_strategy(buf, &tmp))
+                       return -EINVAL;
+       } else {
+               tmp = simple_strtoull(buf, &end, 10);
+               if (*end != '\0')
+                       return -EINVAL;
+       }
+       spin_lock_irqsave(&counter->lock, flags);
        val = res_counter_member(counter, member);
        *val = tmp;
-       ret = nbytes;
-out_free:
-       kfree(buf);
-out:
-       return ret;
+       spin_unlock_irqrestore(&counter->lock, flags);
+       return 0;
 }