netlink: rename netlink_unbind() to netlink_undo_bind()
The new name is more expressive - this isn't a generic unbind function but rather only a little undo helper for use only in netlink_bind(). Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
eb46e2215f
commit
02c81ab95d
@ -1410,8 +1410,8 @@ static int netlink_realloc_groups(struct sock *sk)
|
|||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void netlink_unbind(int group, long unsigned int groups,
|
static void netlink_undo_bind(int group, long unsigned int groups,
|
||||||
struct netlink_sock *nlk)
|
struct netlink_sock *nlk)
|
||||||
{
|
{
|
||||||
int undo;
|
int undo;
|
||||||
|
|
||||||
@ -1461,7 +1461,7 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr,
|
|||||||
err = nlk->netlink_bind(group);
|
err = nlk->netlink_bind(group);
|
||||||
if (!err)
|
if (!err)
|
||||||
continue;
|
continue;
|
||||||
netlink_unbind(group, groups, nlk);
|
netlink_undo_bind(group, groups, nlk);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1471,7 +1471,7 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr,
|
|||||||
netlink_insert(sk, net, nladdr->nl_pid) :
|
netlink_insert(sk, net, nladdr->nl_pid) :
|
||||||
netlink_autobind(sock);
|
netlink_autobind(sock);
|
||||||
if (err) {
|
if (err) {
|
||||||
netlink_unbind(nlk->ngroups, groups, nlk);
|
netlink_undo_bind(nlk->ngroups, groups, nlk);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user