p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tipc: a couple of cleanups 

- We remove the 'reclaiming' member list in struct tipc_group, since
  it doesn't serve any purpose.

- We simplify the GRP_REMIT_MSG branch of tipc_group_protocol_rcv().

Acked-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jon Maloy 2018-01-08 21:03:23 +01:00 committed by David S. Miller
parent a67c01e209
commit 8d5dee21f6
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/tipc/group.c
View File

@ -85,7 +85,6 @@ struct tipc_group {
struct list_head small_win; struct list_head small_win;
struct list_head pending; struct list_head pending;
struct list_head active; struct list_head active;
struct list_head reclaiming;
struct tipc_nlist dests; struct tipc_nlist dests;
struct net *net; struct net *net;
int subid; int subid;
@ -172,7 +171,6 @@ struct tipc_group *tipc_group_create(struct net *net, u32 portid,
INIT_LIST_HEAD(&grp->small_win); INIT_LIST_HEAD(&grp->small_win);
INIT_LIST_HEAD(&grp->active); INIT_LIST_HEAD(&grp->active);
INIT_LIST_HEAD(&grp->pending); INIT_LIST_HEAD(&grp->pending);
INIT_LIST_HEAD(&grp->reclaiming);
grp->members = RB_ROOT; grp->members = RB_ROOT;
grp->net = net; grp->net = net;
grp->portid = portid; grp->portid = portid;
@ -575,7 +573,7 @@ void tipc_group_update_rcv_win(struct tipc_group *grp, int blks, u32 node,
if (!list_empty(active) && active_cnt >= reclaim_limit) { if (!list_empty(active) && active_cnt >= reclaim_limit) {
rm = list_first_entry(active, struct tipc_member, list); rm = list_first_entry(active, struct tipc_member, list);
rm->state = MBR_RECLAIMING; rm->state = MBR_RECLAIMING;
list_move_tail(&rm->list, &grp->reclaiming); list_del_init(&rm->list);
tipc_group_proto_xmit(grp, rm, GRP_RECLAIM_MSG, xmitq); tipc_group_proto_xmit(grp, rm, GRP_RECLAIM_MSG, xmitq);
} }
/* If max active, become pending and wait for reclaimed space */ /* If max active, become pending and wait for reclaimed space */
@ -600,12 +598,12 @@ void tipc_group_update_rcv_win(struct tipc_group *grp, int blks, u32 node,
if (m->advertised > ADV_IDLE) if (m->advertised > ADV_IDLE)
break; break;
m->state = MBR_JOINED; m->state = MBR_JOINED;
grp->active_cnt--;
if (m->advertised < ADV_IDLE) { if (m->advertised < ADV_IDLE) {
pr_warn_ratelimited("Rcv unexpected msg after REMIT\n"); pr_warn_ratelimited("Rcv unexpected msg after REMIT\n");
tipc_group_proto_xmit(grp, m, GRP_ADV_MSG, xmitq); tipc_group_proto_xmit(grp, m, GRP_ADV_MSG, xmitq);
} }
grp->active_cnt--;
list_del_init(&m->list);
if (list_empty(&grp->pending)) if (list_empty(&grp->pending))
return; return;
@ -761,18 +759,14 @@ void tipc_group_proto_rcv(struct tipc_group *grp, bool *usr_wakeup,
m->advertised = ADV_IDLE + in_flight; m->advertised = ADV_IDLE + in_flight;
return; return;
} }
/* All messages preceding the REMIT have been read */ /* This should never happen */
if (m->advertised <= remitted) {
m->state = MBR_JOINED;
in_flight = 0;
}
/* ..and the REMIT overtaken by more messages => re-advertise */
if (m->advertised < remitted) if (m->advertised < remitted)
tipc_group_proto_xmit(grp, m, GRP_ADV_MSG, xmitq); pr_warn_ratelimited("Unexpected REMIT msg\n");
m->advertised = ADV_IDLE + in_flight; /* All messages preceding the REMIT have been read */
m->state = MBR_JOINED;
grp->active_cnt--; grp->active_cnt--;
list_del_init(&m->list); m->advertised = ADV_IDLE;
/* Set oldest pending member to active and advertise */ /* Set oldest pending member to active and advertise */
if (list_empty(&grp->pending)) if (list_empty(&grp->pending))