Quoting aris@xxxxxxxxxx (aris@xxxxxxxxxx):
> In preparation for the next patch, reorder dev_exception_add() and
> dev_exception_rm().
>
> This patch doesn't introduce any functional changes.
>
> Acked-by: Tejun Heo <tj@xxxxxxxxxx>
> Cc: Tejun Heo <tj@xxxxxxxxxx>
> Cc: Serge Hallyn <serge.hallyn@xxxxxxxxxxxxx>
Acked-by: Serge Hallyn <serge.hallyn@xxxxxxxxxxxxx>
> Signed-off-by: Aristeu Rozanski <aris@xxxxxxxxxx>
>
> ---
> security/device_cgroup.c | 44 ++++++++++++++++++++++----------------------
> 1 file changed, 22 insertions(+), 22 deletions(-)
>
> --- github.orig/security/device_cgroup.c 2013-01-29 11:49:14.739657516 -0500
> +++ github/security/device_cgroup.c 2013-01-29 11:49:14.987661210 -0500
> @@ -104,18 +104,14 @@ free_and_exit:
> /*
> * called under devcgroup_mutex
> */
> -static int dev_exception_add(struct list_head *exceptions,
> +static void dev_exception_rm(struct list_head *exceptions,
> struct dev_exception_item *ex)
> {
> - struct dev_exception_item *excopy, *walk;
> + struct dev_exception_item *walk, *tmp;
>
> lockdep_assert_held(&devcgroup_mutex);
>
> - excopy = kmemdup(ex, sizeof(*ex), GFP_KERNEL);
> - if (!excopy)
> - return -ENOMEM;
> -
> - list_for_each_entry(walk, exceptions, list) {
> + list_for_each_entry_safe(walk, tmp, exceptions, list) {
> if (walk->type != ex->type)
> continue;
> if (walk->major != ex->major)
> @@ -123,27 +119,29 @@ static int dev_exception_add(struct list
> if (walk->minor != ex->minor)
> continue;
>
> - walk->access |= ex->access;
> - kfree(excopy);
> - excopy = NULL;
> + walk->access &= ~ex->access;
> + if (!walk->access) {
> + list_del_rcu(&walk->list);
> + kfree_rcu(walk, rcu);
> + }
> }
> -
> - if (excopy != NULL)
> - list_add_tail_rcu(&excopy->list, exceptions);
> - return 0;
> }
>
> /*
> * called under devcgroup_mutex
> */
> -static void dev_exception_rm(struct list_head *exceptions,
> +static int dev_exception_add(struct list_head *exceptions,
> struct dev_exception_item *ex)
> {
> - struct dev_exception_item *walk, *tmp;
> + struct dev_exception_item *excopy, *walk;
>
> lockdep_assert_held(&devcgroup_mutex);
>
> - list_for_each_entry_safe(walk, tmp, exceptions, list) {
> + excopy = kmemdup(ex, sizeof(*ex), GFP_KERNEL);
> + if (!excopy)
> + return -ENOMEM;
> +
> + list_for_each_entry(walk, exceptions, list) {
> if (walk->type != ex->type)
> continue;
> if (walk->major != ex->major)
> @@ -151,12 +149,14 @@ static void dev_exception_rm(struct list
> if (walk->minor != ex->minor)
> continue;
>
> - walk->access &= ~ex->access;
> - if (!walk->access) {
> - list_del_rcu(&walk->list);
> - kfree_rcu(walk, rcu);
> - }
> + walk->access |= ex->access;
> + kfree(excopy);
> + excopy = NULL;
> }
> +
> + if (excopy != NULL)
> + list_add_tail_rcu(&excopy->list, exceptions);
> + return 0;
> }
>
> static void __dev_exception_clean(struct dev_cgroup *dev_cgroup)
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe cgroups" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
