Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Just simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 8 insertions, 0 deletions

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 269512b94a94..00f5b358aeac 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -2314,6 +2314,14 @@ out_release_tset:
                 list_del_init(&cset->mg_node);
         }
         spin_unlock_irq(&css_set_lock);
+
+        /*
+         * Re-initialize the cgroup_taskset structure in case it is reused
+         * again in another cgroup_migrate_add_task()/cgroup_migrate_execute()
+         * iteration.
+         */
+        tset->nr_tasks = 0;
+        tset->csets    = &tset->src_csets;
         return ret;
 }