Commit 93532bb1 authored by Ying Xue's avatar Ying Xue Committed by David S. Miller
Browse files

tipc: Introduce __tipc_nl_bearer_set 



Introduce __tipc_nl_bearer_set() which doesn't holding RTNL lock.

Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 45cf7edf

net/tipc/bearer.c

+14 −9
Original line number Diff line number Diff line
@@ -954,7 +954,7 @@ int tipc_nl_bearer_add(struct sk_buff *skb, struct genl_info *info) 
	return 0;

}



int tipc_nl_bearer_set(struct sk_buff *skb, struct genl_info *info)

int __tipc_nl_bearer_set(struct sk_buff *skb, struct genl_info *info)

{

	int err;

	char *name;
@@ -975,22 +975,17 @@ int tipc_nl_bearer_set(struct sk_buff *skb, struct genl_info *info) 
		return -EINVAL;

	name = nla_data(attrs[TIPC_NLA_BEARER_NAME]);



	rtnl_lock();

	b = tipc_bearer_find(net, name);

	if (!b) {

		rtnl_unlock();

	if (!b)

		return -EINVAL;

	}



	if (attrs[TIPC_NLA_BEARER_PROP]) {

		struct nlattr *props[TIPC_NLA_PROP_MAX + 1];



		err = tipc_nl_parse_link_prop(attrs[TIPC_NLA_BEARER_PROP],

					      props);

		if (err) {

			rtnl_unlock();

		if (err)

			return err;

		}



		if (props[TIPC_NLA_PROP_TOL])

			b->tolerance = nla_get_u32(props[TIPC_NLA_PROP_TOL]);
@@ -999,11 +994,21 @@ int tipc_nl_bearer_set(struct sk_buff *skb, struct genl_info *info) 
		if (props[TIPC_NLA_PROP_WIN])

			b->window = nla_get_u32(props[TIPC_NLA_PROP_WIN]);

	}

	rtnl_unlock();



	return 0;

}



int tipc_nl_bearer_set(struct sk_buff *skb, struct genl_info *info)

{

	int err;



	rtnl_lock();

	err = __tipc_nl_bearer_set(skb, info);

	rtnl_unlock();



	return err;

}



static int __tipc_nl_add_media(struct tipc_nl_msg *msg,

			       struct tipc_media *media, int nlflags)

{

net/tipc/bearer.h

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ int __tipc_nl_bearer_enable(struct sk_buff *skb, struct genl_info *info); 
int tipc_nl_bearer_dump(struct sk_buff *skb, struct netlink_callback *cb);

int tipc_nl_bearer_get(struct sk_buff *skb, struct genl_info *info);

int tipc_nl_bearer_set(struct sk_buff *skb, struct genl_info *info);

int __tipc_nl_bearer_set(struct sk_buff *skb, struct genl_info *info);

int tipc_nl_bearer_add(struct sk_buff *skb, struct genl_info *info);



int tipc_nl_media_dump(struct sk_buff *skb, struct netlink_callback *cb);