linux-kernel - Re: [PATCH 136/196] Kobject: convert net/bridge/br_if.c to use kobject_init/add

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20080125082020.238873ae@deepthought>
Date:	Fri, 25 Jan 2008 08:20:20 -0800
From:	Stephen Hemminger <shemminger@...ux-foundation.org>
To:	Greg Kroah-Hartman <gregkh@...e.de>
Cc:	linux-kernel@...r.kernel.org, Greg Kroah-Hartman <gregkh@...e.de>,
	Kay Sievers <kay.sievers@...y.org>
Subject: Re: [PATCH 136/196] Kobject: convert net/bridge/br_if.c to use
 kobject_init/add_ng()

On Thu, 24 Jan 2008 23:32:45 -0800
Greg Kroah-Hartman <gregkh@...e.de> wrote:

> This converts the code to use the new kobject functions, cleaning up the
> logic in doing so.
> 
> Cc: Stephen Hemminger <shemminger@...ux-foundation.org>
> Cc: Kay Sievers <kay.sievers@...y.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
> ---
>  net/bridge/br_if.c |   10 +++-------
>  1 files changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
> index dadec94..298e0f4 100644
> --- a/net/bridge/br_if.c
> +++ b/net/bridge/br_if.c
> @@ -258,12 +258,6 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br,
>  	p->state = BR_STATE_DISABLED;
>  	br_stp_port_timer_init(p);
>  
> -	kobject_init(&p->kobj);
> -	kobject_set_name(&p->kobj, SYSFS_BRIDGE_PORT_ATTR);
> -	p->kobj.ktype = &brport_ktype;
> -	p->kobj.parent = &(dev->dev.kobj);
> -	p->kobj.kset = NULL;
> -
>  	return p;
>  }
>  
> @@ -379,7 +373,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
>  	if (IS_ERR(p))
>  		return PTR_ERR(p);
>  
> -	err = kobject_add(&p->kobj);
> +	err = kobject_init_and_add(&p->kobj, &brport_ktype, &(dev->dev.kobj),
> +				   SYSFS_BRIDGE_PORT_ATTR);
>  	if (err)
>  		goto err0;
>  
> @@ -416,6 +411,7 @@ err2:
>  	br_fdb_delete_by_port(br, p, 1);
>  err1:
>  	kobject_del(&p->kobj);
> +	return err;
>  err0:
>  	kobject_put(&p->kobj);
>  	return err;

This is fine, no issues.

-- 
Stephen Hemminger <stephen.hemminger@...tta.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/