leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tipc: simplify signature of tipc_nametbl_withdraw() functions

Browse Source 
Following the principles of the preceding commits, we reduce
the number of parameters passed along in tipc_sk_withdraw(),
tipc_nametbl_withdraw() and associated functions.

Signed-off-by: Jon Maloy <jmaloy@redhat.com>
Acked-by: Ying Xue <ying.xue@windriver.com>
Acked-by: Hoang Le <hoang.h.le@dektech.com.au>
Acked-by: Tung Nguyen <tung.q.nguyen@dektech.com.au>
Acked-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jon Maloy
2021-03-16 22:06:13 -04:00
committed by David S. Miller
parent a45ffa6857
commit 2c98da0790
5 changed files with 71 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
net/tipc/socket.c
View File

@@ -152,8 +152,7 @@ static int tipc_accept(struct socket *sock, struct socket *new_sock, int flags,
bool kern);
static void tipc_sk_timeout(struct timer_list *t);
static int tipc_sk_publish(struct tipc_sock *tsk, struct tipc_uaddr *ua);
static int tipc_sk_withdraw(struct tipc_sock *tsk, uint scope,
struct tipc_service_range const *seq);
static int tipc_sk_withdraw(struct tipc_sock *tsk, struct tipc_uaddr *ua);
static int tipc_sk_leave(struct tipc_sock *tsk);
static struct tipc_sock *tipc_sk_lookup(struct net *net, u32 portid);
static int tipc_sk_insert(struct tipc_sock *tsk);
@@ -643,7 +642,7 @@ static int tipc_release(struct socket *sock)
__tipc_shutdown(sock, TIPC_ERR_NO_PORT);
sk->sk_shutdown = SHUTDOWN_MASK;
tipc_sk_leave(tsk);
tipc_sk_withdraw(tsk, 0, NULL);
tipc_sk_withdraw(tsk, NULL);
__skb_queue_purge(&tsk->mc_method.deferredq);
sk_stop_timer(sk, &sk->sk_timer);
tipc_sk_remove(tsk);
@@ -681,7 +680,7 @@ static int __tipc_bind(struct socket *sock, struct sockaddr *skaddr, int alen)
bool unbind = false;
if (unlikely(!alen))
return tipc_sk_withdraw(tsk, 0, NULL);
return tipc_sk_withdraw(tsk, NULL);
if (ua->addrtype == TIPC_SERVICE_ADDR) {
ua->addrtype = TIPC_SERVICE_RANGE;
@@ -699,7 +698,7 @@ static int __tipc_bind(struct socket *sock, struct sockaddr *skaddr, int alen)
return -EACCES;
if (unbind)
return tipc_sk_withdraw(tsk, ua->scope, &ua->sr);
return tipc_sk_withdraw(tsk, ua);
return tipc_sk_publish(tsk, ua);
}
@@ -2923,38 +2922,37 @@ static int tipc_sk_publish(struct tipc_sock *tsk, struct tipc_uaddr *ua)
return 0;
}
static int tipc_sk_withdraw(struct tipc_sock *tsk, uint scope,
struct tipc_service_range const *seq)
static int tipc_sk_withdraw(struct tipc_sock *tsk, struct tipc_uaddr *ua)
{
struct net *net = sock_net(&tsk->sk);
struct publication *p;
struct publication *safe;
struct publication *safe, *p;
struct tipc_uaddr _ua;
int rc = -EINVAL;
if (scope != TIPC_NODE_SCOPE)
scope = TIPC_CLUSTER_SCOPE;
list_for_each_entry_safe(p, safe, &tsk->publications, binding_sock) {
if (seq) {
if (p->scope != scope)
continue;
if (p->sr.type != seq->type)
continue;
if (p->sr.lower != seq->lower)
continue;
if (p->sr.upper != seq->upper)
break;
tipc_nametbl_withdraw(net, p->sr.type, p->sr.lower,
p->sr.upper, p->key);
rc = 0;
break;
if (!ua) {
tipc_uaddr(&_ua, TIPC_SERVICE_RANGE, p->scope,
p->sr.type, p->sr.lower, p->sr.upper);
tipc_nametbl_withdraw(net, &_ua, &p->sk, p->key);
continue;
}
tipc_nametbl_withdraw(net, p->sr.type, p->sr.lower,
p->sr.upper, p->key);
/* Unbind specific publication */
if (p->scope != ua->scope)
continue;
if (p->sr.type != ua->sr.type)
continue;
if (p->sr.lower != ua->sr.lower)
continue;
if (p->sr.upper != ua->sr.upper)
break;
tipc_nametbl_withdraw(net, ua, &p->sk, p->key);
rc = 0;
break;
}
if (list_empty(&tsk->publications)) {
tsk->published = 0;
rc = 0;
}
if (list_empty(&tsk->publications))
tsk->published = 0;
return rc;
}
@@ -3109,15 +3107,17 @@ static int tipc_sk_leave(struct tipc_sock *tsk)
{
struct net *net = sock_net(&tsk->sk);
struct tipc_group *grp = tsk->group;
struct tipc_service_range seq;
struct tipc_uaddr ua;
int scope;
if (!grp)
return -EINVAL;
tipc_group_self(grp, &seq, &scope);
ua.addrtype = TIPC_SERVICE_RANGE;
tipc_group_self(grp, &ua.sr, &scope);
ua.scope = scope;
tipc_group_delete(net, grp);
tsk->group = NULL;
tipc_sk_withdraw(tsk, scope, &seq);
tipc_sk_withdraw(tsk, &ua);
return 0;
}