]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
cgroup, netclassid: remove double cond_resched
authorJiri Slaby <jslaby@suse.cz>
Mon, 20 Apr 2020 07:04:24 +0000 (09:04 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 10 May 2020 08:30:12 +0000 (10:30 +0200)
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>
net/core/netclassid_cgroup.c

index 67feeb207dad606401d86c299c912739c0de7e28..668330ace961607c07ce98e9de0edf843c96b26e 100644 (file)
@@ -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;