aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-10-25 17:15:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-10-25 17:15:46 -0700
commit83c4087ce468601501ecde4d0ec5b2abd5f57c31 (patch)
tree238d60de7b4f5b4b70fe851c76f04e5a5f5efaa4 /net
parenta67eefad996f007afc7c38efe8f45257fb1e3994 (diff)
parenta90e90b7d55e789c71d85b946ffb5c1ab2f137ca (diff)
downloadlinux-83c4087ce468601501ecde4d0ec5b2abd5f57c31.tar.gz
Merge branch 'for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup updates from Tejun Heo: "All trivial changes - simplification, typo fix and adding cond_resched() in a netclassid update loop" * 'for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cgroup, netclassid: add a preemption point to write_classid rdmacg: fix a typo in rdmacg documentation cgroup: Simplify cgroup_ancestor
Diffstat (limited to 'net')
-rw-r--r--net/core/netclassid_cgroup.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/netclassid_cgroup.c b/net/core/netclassid_cgroup.c
index 5e4f04004a49..7bf833598615 100644
--- a/net/core/netclassid_cgroup.c
+++ b/net/core/netclassid_cgroup.c
@@ -106,6 +106,7 @@ static int write_classid(struct cgroup_subsys_state *css, struct cftype *cft,
iterate_fd(p->files, 0, update_classid_sock,
(void *)(unsigned long)cs->classid);
task_unlock(p);
+ cond_resched();
}
css_task_iter_end(&it);