On Sun, Jul 27, 2008 at 7:20 PM, Li Zefan <lizf@xxxxxxxxxxxxxx> wrote: > - just call free_cg_links() in allocate_cg_links() > - the list will get initialized in allocate_cg_links(), so don't init > it twice > > Signed-off-by: Li Zefan <lizf@xxxxxxxxxxxxxx> (Belatedly) Acked-by: Paul Menage <menage@xxxxxxxxxx> Thanks, looks like a good cleanup. > --- > kernel/cgroup.c | 30 ++++++++++++------------------ > 1 files changed, 12 insertions(+), 18 deletions(-) > > diff --git a/kernel/cgroup.c b/kernel/cgroup.c > index 28debe4..249a517 100644 > --- a/kernel/cgroup.c > +++ b/kernel/cgroup.c > @@ -355,6 +355,17 @@ static struct css_set *find_existing_css_set( > return NULL; > } > > +static void free_cg_links(struct list_head *tmp) > +{ > + struct cg_cgroup_link *link; > + struct cg_cgroup_link *saved_link; > + > + list_for_each_entry_safe(link, saved_link, tmp, cgrp_link_list) { > + list_del(&link->cgrp_link_list); > + kfree(link); > + } > +} > + > /* > * allocate_cg_links() allocates "count" cg_cgroup_link structures > * and chains them on tmp through their cgrp_link_list fields. Returns 0 on > @@ -363,17 +374,12 @@ static struct css_set *find_existing_css_set( > static int allocate_cg_links(int count, struct list_head *tmp) > { > struct cg_cgroup_link *link; > - struct cg_cgroup_link *saved_link; > int i; > INIT_LIST_HEAD(tmp); > for (i = 0; i < count; i++) { > link = kmalloc(sizeof(*link), GFP_KERNEL); > if (!link) { > - list_for_each_entry_safe(link, saved_link, tmp, > - cgrp_link_list) { > - list_del(&link->cgrp_link_list); > - kfree(link); > - } > + free_cg_links(tmp); > return -ENOMEM; > } > list_add(&link->cgrp_link_list, tmp); > @@ -381,17 +387,6 @@ static int allocate_cg_links(int count, struct list_head *tmp) > return 0; > } > > -static void free_cg_links(struct list_head *tmp) > -{ > - struct cg_cgroup_link *link; > - struct cg_cgroup_link *saved_link; > - > - list_for_each_entry_safe(link, saved_link, tmp, cgrp_link_list) { > - list_del(&link->cgrp_link_list); > - kfree(link); > - } > -} > - > /* > * find_css_set() takes an existing cgroup group and a > * cgroup object, and returns a css_set object that's > @@ -956,7 +951,6 @@ static int cgroup_get_sb(struct file_system_type *fs_type, > struct super_block *sb; > struct cgroupfs_root *root; > struct list_head tmp_cg_links; > - INIT_LIST_HEAD(&tmp_cg_links); > > /* First find the desired set of subsystems */ > ret = parse_cgroupfs_options(data, &opts); > -- > 1.5.4.rc3 > > _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/containers