minor clean-up

2 files changed, 39 insertions, 22 deletions

diff --git a/litmus/color.c b/litmus/color.c
index 1077473c8ae9..aefb76e36626 100644
--- a/litmus/color.c
+++ b/litmus/color.c
@@ -57,17 +57,20 @@ void add_page_to_color_list(struct page *page)
 struct page* get_colored_page(unsigned long color)
 {
         struct color_group *cgroup;
-        struct page *page;
+        struct page *page = NULL;
         BUG_ON(color >= nr_colors);
         cgroup = &color_groups[color];
         spin_lock(&cgroup->lock);
-        BUG_ON(!atomic_read(&cgroup->nr_pages));
+        if (unlikely(!atomic_read(&cgroup->nr_pages))) {
+                printk(KERN_WARNING "no free %lu colored pages.\n", color);
+                goto out_unlock;
+        }
         page = list_first_entry(&cgroup->list, struct page, lru);
         list_del(&page->lru);
         atomic_dec(&cgroup->nr_pages);
+out_unlock:
         spin_unlock(&cgroup->lock);
         return page;
-
 }
 
 static unsigned long smallest_nr_pages(void)
@@ -94,9 +97,10 @@ static int do_add_pages(void)
         while (smallest_nr_pages() < PAGES_PER_COLOR) {
                 page = alloc_page(GFP_HIGHUSER | __GFP_ZERO |
                                 __GFP_MOVABLE);
-                if (!page) {
+                if (unlikely(!page)) {
                         MPRINT("could not allocate pages\n");
-                        BUG();
+                        ret = -ENOMEM;
+                        goto out;
                 }
                 color = page_color(page);
                 if (atomic_read(&color_groups[color].nr_pages) < PAGES_PER_COLOR)
@@ -108,6 +112,7 @@ static int do_add_pages(void)
                 list_del(&page->lru);
                 __free_page(page);
         }
+out:
         return ret;
 }
 
@@ -119,14 +124,14 @@ static int do_add_pages(void)
 int color_add_pages_handler(struct ctl_table *table, int write, void __user *buffer,
                 size_t *lenp, loff_t *ppos)
 {
-        int ret;
-
+        int ret = 0;
         ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
         if (ret)
-                return ret;
+                goto out;
         if (write && color_sysctl_add_pages_data)
-                do_add_pages();
-        return 0;
+                ret = do_add_pages();
+out:
+        return ret;
 }
 
 
@@ -136,18 +141,21 @@ int color_nr_pages_handler(struct ctl_table *table, int write, void __user *buff
         struct color_group *cgroup;
         char *buf;
         unsigned long i;
-        int used = 0;
-
-        if (write)
-                return -EPERM;
+        int used = 0, ret = 0;
 
+        if (write) {
+                ret = -EPERM;
+                goto out;
+        }
         for (i = 0; i < nr_colors; ++i) {
                 cgroup = &color_groups[i];
                 buf = ((char*)table->data) + used;
                 used += snprintf(buf, table->maxlen - used, ONE_COLOR_FMT,
                                 i, atomic_read(&cgroup->nr_pages));
         }
-        return proc_dostring(table, write, buffer, lenp, ppos);
+        ret = proc_dostring(table, write, buffer, lenp, ppos);
+out:
+        return ret;
 }
 
 /***********************************************************
@@ -182,11 +190,13 @@ static int __init init_color_groups(void)
 {
         struct color_group *cgroup;
         unsigned long i;
+        int ret = 0;
 
         color_groups = kmalloc(nr_colors * sizeof(struct color_group), GFP_KERNEL);
         if (!color_groups) {
                 printk(KERN_WARNING "Could not allocate color groups.\n");
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto out;
         }
 
         for (i = 0; i < nr_colors; ++i) {
@@ -197,7 +207,8 @@ static int __init init_color_groups(void)
                 LOCKDEP_DYNAMIC_ALLOC(&cgroup->lock, &color_lock_keys[i],
                                 cgroup->_lock_name, "color%lu", i);
         }
-        return 0;
+out:
+        return ret;
 }
 
 static int __init init_color(void)
diff --git a/litmus/color_proc.c b/litmus/color_proc.c
index 1eba0740db9d..31eec0d728a5 100644
--- a/litmus/color_proc.c
+++ b/litmus/color_proc.c
@@ -54,26 +54,32 @@ extern unsigned long nr_colors; /* litmus/color.c */
 /* must be called AFTER nr_colors is set */
 static int __init init_sysctl_nr_colors(void)
 {
-        int maxlen = ONE_COLOR_LEN * nr_colors;
+        int ret = 0, maxlen = ONE_COLOR_LEN * nr_colors;
         color_table[NR_PAGES_INDEX].data = kmalloc(maxlen, GFP_KERNEL);
         if (!color_table[NR_PAGES_INDEX].data) {
                 printk(KERN_WARNING "Could not allocate nr_pages buffer.\n");
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto out;
         }
         color_table[NR_PAGES_INDEX].maxlen = maxlen;
-        return 0;
+out:
+        return ret;
 }
 
 static struct ctl_table_header *litmus_sysctls;
 
 static int __init litmus_sysctl_init(void)
 {
+        int ret = 0;
         litmus_sysctls = register_sysctl_table(litmus_dir_table);
         if (!litmus_sysctls) {
                 printk(KERN_WARNING "Could not register LITMUS^RT sysctl.\n");
-                return -EFAULT;
+                ret = -EFAULT;
+                goto out;
         }
-        return init_sysctl_nr_colors();
+        ret = init_sysctl_nr_colors();
+out:
+        return ret;
 }
 
 module_init(litmus_sysctl_init);