From: Ionut Alexa <johnnyal...@yahoo.com>
Fixed coding style issues.
Signed-off-by: Ionut Alexa <johnnyal...@yahoo.com>
---
kernel/cgroup.c | 36 ++++++++++++++++++++++--------------
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 70776ae..fb6a4fd 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -83,8 +83,8 @@
*/
#ifdef CONFIG_PROVE_RCU
DEFINE_MUTEX(cgroup_mutex);
-DECLARE_RWSEM(css_set_rwsem);
EXPORT_SYMBOL_GPL(cgroup_mutex);
+DECLARE_RWSEM(css_set_rwsem);
EXPORT_SYMBOL_GPL(css_set_rwsem);
#else
static DEFINE_MUTEX(cgroup_mutex);
@@ -106,7 +106,7 @@ static DEFINE_SPINLOCK(release_agent_path_lock);
#define cgroup_assert_mutex_or_rcu_locked() \
rcu_lockdep_assert(rcu_read_lock_held() || \
lockdep_is_held(&cgroup_mutex), \
- "cgroup_mutex or RCU read lock required");
+ "cgroup_mutex or RCU read lock required")
/*
* cgroup destruction makes heavy use of work items and there can be a lot
@@ -123,15 +123,17 @@ static struct workqueue_struct *cgroup_destroy_wq;
static struct workqueue_struct *cgroup_pidlist_destroy_wq;
/* generate an array of cgroup subsystem pointers */
-#define SUBSYS(_x) [_x ## _cgrp_id] = &_x ## _cgrp_subsys,
+#define SUBSYS(_x) \
+ [_x ## _cgrp_id] = &_x ## _cgrp_subsys,
static struct cgroup_subsys *cgroup_subsys[] = {
#include <linux/cgroup_subsys.h>
};
#undef SUBSYS
/* array of cgroup subsystem names */
-#define SUBSYS(_x) [_x ## _cgrp_id] = #_x,
-static const char *cgroup_subsys_name[] = {
+#define SUBSYS(_x) \
+ [_x ## _cgrp_id] = #_x,
+static const char * const cgroup_subsys_name[] = {
#include <linux/cgroup_subsys.h>
};
#undef SUBSYS
@@ -1325,6 +1327,7 @@ static int parse_cgroupfs_options(char *data, struct
cgroup_sb_opts *opts)
/* Must match [\w.-]+ */
for (i = 0; i < strlen(name); i++) {
char c = name[i];
+
if (isalnum(c))
continue;
if ((c == '.') || (c == '-') || (c == '_'))
@@ -1694,7 +1697,7 @@ static struct dentry *cgroup_mount(struct
file_system_type *fs_type,
if (!percpu_ref_tryget_live(&ss->root->cgrp.self.refcnt)) {
mutex_unlock(&cgroup_mutex);
- msleep(10);
+ usleep_range(10000, 11000);
ret = restart_syscall();
goto out_free;
}
@@ -1758,7 +1761,7 @@ static struct dentry *cgroup_mount(struct
file_system_type *fs_type,
mutex_unlock(&cgroup_mutex);
if (!IS_ERR_OR_NULL(pinned_sb))
deactivate_super(pinned_sb);
- msleep(10);
+ usleep_range(10000, 11000);
ret = restart_syscall();
goto out_free;
}
@@ -2191,7 +2194,7 @@ static int cgroup_migrate(struct cgroup *cgrp, struct
task_struct *leader,
if (list_empty(&cset->mg_dst_cset->mg_node))
list_move_tail(&cset->mg_dst_cset->mg_node,
&tset.dst_csets);
- next:
+next:
if (!threadgroup)
break;
} while_each_thread(leader, task);
@@ -2764,6 +2767,7 @@ err_undo_css:
cgroup_for_each_live_child(child, cgrp) {
struct cgroup_subsys_state *css = cgroup_css(child, ss);
+
if (css)
kill_css(css);
}
@@ -2800,12 +2804,16 @@ static ssize_t cgroup_file_write(struct
kernfs_open_file *of, char *buf,
if (cft->write_u64) {
unsigned long long v;
+
ret = kstrtoull(buf, 0, &v);
+
if (!ret)
ret = cft->write_u64(css, cft, v);
} else if (cft->write_s64) {
long long v;
+
ret = kstrtoll(buf, 0, &v);
+
if (!ret)
ret = cft->write_s64(css, cft, v);
} else {
@@ -3954,6 +3962,7 @@ static void *cgroup_pidlist_start(struct seq_file *s,
loff_t *pos)
while (index < end) {
int mid = (index + end) / 2;
+
if (cgroup_pid_fry(cgrp, l->list[mid]) == pid) {
index = mid;
break;
@@ -4682,7 +4691,7 @@ static void __init cgroup_init_subsys(struct
cgroup_subsys *ss, bool early)
{
struct cgroup_subsys_state *css;
- printk(KERN_INFO "Initializing cgroup subsys %s\n", ss->name);
+ pr_info("Initializing cgroup subsys %s\n", ss->name);
mutex_lock(&cgroup_mutex);
@@ -4736,8 +4745,8 @@ static void __init cgroup_init_subsys(struct
cgroup_subsys *ss, bool early)
*/
int __init cgroup_init_early(void)
{
- static struct cgroup_sb_opts __initdata opts =
- { .flags = CGRP_ROOT_SANE_BEHAVIOR };
+ static struct cgroup_sb_opts opts __initdata = {
+ .flags = CGRP_ROOT_SANE_BEHAVIOR };
struct cgroup_subsys *ss;
int i;
@@ -5195,8 +5204,7 @@ static int __init cgroup_disable(char *str)
for_each_subsys(ss, i) {
if (!strcmp(token, ss->name)) {
ss->disabled = 1;
- printk(KERN_INFO "Disabling %s control group"
- " subsystem\n", ss->name);
+ pr_info("Disabling %s control group
subsystem\n", ss->name);
break;
}
}
@@ -5350,7 +5358,7 @@ static int cgroup_css_links_read(struct seq_file *seq,
void *v)
seq_printf(seq, " task %d\n", task_pid_vnr(task));
}
continue;
- overflow:
+overflow:
seq_puts(seq, " ...\n");
}
up_read(&css_set_rwsem);
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
