diff options
author | Paul Jackson <pj@sgi.com> | 2008-02-07 03:13:44 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 11:42:17 -0500 |
commit | e18f6318e5dab189efd4cb0bbfcbd923cc373e3c (patch) | |
tree | b39152c3a5732c4fc0eba8830e82a0f4afb4d817 /kernel | |
parent | 3cdeed2986b09fcc77b4812ca10dbc057e4e5f8c (diff) |
cgroup brace coding style fix
Coding style fix - one line conditionals don't get braces.
Signed-off-by: Paul Jackson <pj@sgi.com>
Acked-by: Paul Menage <menage@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/cgroup.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index ae367471b07b..54760d5b651e 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
@@ -1181,9 +1181,8 @@ static int attach_task(struct cgroup *cgrp, struct task_struct *tsk) | |||
1181 | for_each_subsys(root, ss) { | 1181 | for_each_subsys(root, ss) { |
1182 | if (ss->can_attach) { | 1182 | if (ss->can_attach) { |
1183 | retval = ss->can_attach(ss, cgrp, tsk); | 1183 | retval = ss->can_attach(ss, cgrp, tsk); |
1184 | if (retval) { | 1184 | if (retval) |
1185 | return retval; | 1185 | return retval; |
1186 | } | ||
1187 | } | 1186 | } |
1188 | } | 1187 | } |
1189 | 1188 | ||
@@ -1192,9 +1191,8 @@ static int attach_task(struct cgroup *cgrp, struct task_struct *tsk) | |||
1192 | * based on its final set of cgroups | 1191 | * based on its final set of cgroups |
1193 | */ | 1192 | */ |
1194 | newcg = find_css_set(cg, cgrp); | 1193 | newcg = find_css_set(cg, cgrp); |
1195 | if (!newcg) { | 1194 | if (!newcg) |
1196 | return -ENOMEM; | 1195 | return -ENOMEM; |
1197 | } | ||
1198 | 1196 | ||
1199 | task_lock(tsk); | 1197 | task_lock(tsk); |
1200 | if (tsk->flags & PF_EXITING) { | 1198 | if (tsk->flags & PF_EXITING) { |
@@ -1214,9 +1212,8 @@ static int attach_task(struct cgroup *cgrp, struct task_struct *tsk) | |||
1214 | write_unlock(&css_set_lock); | 1212 | write_unlock(&css_set_lock); |
1215 | 1213 | ||
1216 | for_each_subsys(root, ss) { | 1214 | for_each_subsys(root, ss) { |
1217 | if (ss->attach) { | 1215 | if (ss->attach) |
1218 | ss->attach(ss, cgrp, oldcgrp, tsk); | 1216 | ss->attach(ss, cgrp, oldcgrp, tsk); |
1219 | } | ||
1220 | } | 1217 | } |
1221 | set_bit(CGRP_RELEASABLE, &oldcgrp->flags); | 1218 | set_bit(CGRP_RELEASABLE, &oldcgrp->flags); |
1222 | synchronize_rcu(); | 1219 | synchronize_rcu(); |
@@ -1352,9 +1349,8 @@ static ssize_t cgroup_common_file_write(struct cgroup *cgrp, | |||
1352 | { | 1349 | { |
1353 | struct cgroupfs_root *root = cgrp->root; | 1350 | struct cgroupfs_root *root = cgrp->root; |
1354 | /* Strip trailing newline */ | 1351 | /* Strip trailing newline */ |
1355 | if (nbytes && (buffer[nbytes-1] == '\n')) { | 1352 | if (nbytes && (buffer[nbytes-1] == '\n')) |
1356 | buffer[nbytes-1] = 0; | 1353 | buffer[nbytes-1] = 0; |
1357 | } | ||
1358 | 1354 | ||
1359 | /* We never write anything other than '\0' | 1355 | /* We never write anything other than '\0' |
1360 | * into the last char of release_agent_path, | 1356 | * into the last char of release_agent_path, |
@@ -2124,9 +2120,8 @@ static inline int cgroup_has_css_refs(struct cgroup *cgrp) | |||
2124 | * matter, since it can only happen if the cgroup | 2120 | * matter, since it can only happen if the cgroup |
2125 | * has been deleted and hence no longer needs the | 2121 | * has been deleted and hence no longer needs the |
2126 | * release agent to be called anyway. */ | 2122 | * release agent to be called anyway. */ |
2127 | if (css && atomic_read(&css->refcnt)) { | 2123 | if (css && atomic_read(&css->refcnt)) |
2128 | return 1; | 2124 | return 1; |
2129 | } | ||
2130 | } | 2125 | } |
2131 | return 0; | 2126 | return 0; |
2132 | } | 2127 | } |