summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2020-04-20 09:04:24 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-05-10 10:30:12 +0200
commit1e08af942a0cc0c19a3bdcc4c35dc88d43e19607 (patch)
tree90996a9df0a118e607bc56818c9b66c901356887
parent2f83c2cce5fb07752b8eb0bcbae704c42566bb44 (diff)
downloadlinux-stable-1e08af942a0cc0c19a3bdcc4c35dc88d43e19607.tar.gz
linux-stable-1e08af942a0cc0c19a3bdcc4c35dc88d43e19607.tar.bz2
linux-stable-1e08af942a0cc0c19a3bdcc4c35dc88d43e19607.zip
cgroup, netclassid: remove double cond_resched
commit 526f3d96b8f83b1b13d73bd0b5c79cc2c487ec8e upstream. Commit 018d26fcd12a ("cgroup, netclassid: periodically release file_lock on classid") added a second cond_resched to write_classid indirectly by update_classid_task. Remove the one in write_classid. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Dmitry Yakunin <zeil@yandex-team.ru> Cc: Konstantin Khlebnikov <khlebnikov@yandex-team.ru> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/core/netclassid_cgroup.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/core/netclassid_cgroup.c b/net/core/netclassid_cgroup.c
index 67feeb207dad..668330ace961 100644
--- a/net/core/netclassid_cgroup.c
+++ b/net/core/netclassid_cgroup.c
@@ -131,10 +131,8 @@ static int write_classid(struct cgroup_subsys_state *css, struct cftype *cft,
cs->classid = (u32)value;
css_task_iter_start(css, 0, &it);
- while ((p = css_task_iter_next(&it))) {
+ while ((p = css_task_iter_next(&it)))
update_classid_task(p, cs->classid);
- cond_resched();
- }
css_task_iter_end(&it);
return 0;