d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve style in in_pcbinslbgrouphash() and related subroutines.

Browse Source 
No functional change intended.

MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D17107
This commit is contained in:
Mark Johnston 2018-11-01 15:51:49 +00:00
parent e8df8a1da0
commit 79ee680b65
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=340004
1 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
sys/netinet/in_pcb.c
View File

@ -266,7 +266,7 @@ in_pcblbgroup_resize(struct inpcblbgrouphead *hdr,
grp = in_pcblbgroup_alloc(hdr, old_grp->il_vflag,
old_grp->il_lport, &old_grp->il_dependladdr, size);
if (!grp)
if (grp == NULL)
return (NULL);
KASSERT(old_grp->il_inpcnt < grp->il_inpsiz,
@ -288,21 +288,20 @@ static void
in_pcblbgroup_reorder(struct inpcblbgrouphead *hdr, struct inpcblbgroup **grpp,
int i)
{
struct inpcblbgroup *grp = *grpp;
struct inpcblbgroup *grp, *new_grp;
grp = *grpp;
for (; i + 1 < grp->il_inpcnt; ++i)
grp->il_inp[i] = grp->il_inp[i + 1];
grp->il_inpcnt--;
if (grp->il_inpsiz > INPCBLBGROUP_SIZMIN &&
grp->il_inpcnt <= (grp->il_inpsiz / 4)) {
grp->il_inpcnt <= grp->il_inpsiz / 4) {
/* Shrink this group. */
struct inpcblbgroup *new_grp =
in_pcblbgroup_resize(hdr, grp, grp->il_inpsiz / 2);
if (new_grp)
new_grp = in_pcblbgroup_resize(hdr, grp, grp->il_inpsiz / 2);
if (new_grp != NULL)
*grpp = new_grp;
}
return;
}
/*
@ -316,9 +315,7 @@ in_pcbinslbgrouphash(struct inpcb *inp)
struct inpcbinfo *pcbinfo;
struct inpcblbgrouphead *hdr;
struct inpcblbgroup *grp;
uint16_t hashmask, lport;
uint32_t group_index;
struct ucred *cred;
uint32_t idx;
pcbinfo = inp->inp_pcbinfo;
@ -328,19 +325,10 @@ in_pcbinslbgrouphash(struct inpcb *inp)
if (pcbinfo->ipi_lbgrouphashbase == NULL)
return (0);
hashmask = pcbinfo->ipi_lbgrouphashmask;
lport = inp->inp_lport;
group_index = INP_PCBLBGROUP_PORTHASH(lport, hashmask);
hdr = &pcbinfo->ipi_lbgrouphashbase[group_index];
/*
* Don't allow jailed socket to join local group.
*/
if (inp->inp_socket != NULL)
cred = inp->inp_socket->so_cred;
else
cred = NULL;
if (cred != NULL && jailed(cred))
if (inp->inp_socket != NULL && jailed(inp->inp_socket->so_cred))
return (0);
#ifdef INET6
@ -354,24 +342,23 @@ in_pcbinslbgrouphash(struct inpcb *inp)
}
#endif
hdr = &pcbinfo->ipi_lbgrouphashbase[
INP_PCBLBGROUP_PORTHASH(inp->inp_lport,
pcbinfo->ipi_lbgrouphashmask)];
idx = INP_PCBLBGROUP_PORTHASH(inp->inp_lport,
pcbinfo->ipi_lbgrouphashmask);
hdr = &pcbinfo->ipi_lbgrouphashbase[idx];
CK_LIST_FOREACH(grp, hdr, il_list) {
if (grp->il_vflag == inp->inp_vflag &&
grp->il_lport == inp->inp_lport &&
memcmp(&grp->il_dependladdr,
&inp->inp_inc.inc_ie.ie_dependladdr,
sizeof(grp->il_dependladdr)) == 0) {
&inp->inp_inc.inc_ie.ie_dependladdr,
sizeof(grp->il_dependladdr)) == 0)
break;
}
}
if (grp == NULL) {
/* Create new load balance group. */
grp = in_pcblbgroup_alloc(hdr, inp->inp_vflag,
inp->inp_lport, &inp->inp_inc.inc_ie.ie_dependladdr,
INPCBLBGROUP_SIZMIN);
if (!grp)
if (grp == NULL)
return (ENOBUFS);
} else if (grp->il_inpcnt == grp->il_inpsiz) {
if (grp->il_inpsiz >= INPCBLBGROUP_SIZMAX) {
@ -383,13 +370,13 @@ in_pcbinslbgrouphash(struct inpcb *inp)
/* Expand this local group. */
grp = in_pcblbgroup_resize(hdr, grp, grp->il_inpsiz * 2);
if (!grp)
if (grp == NULL)
return (ENOBUFS);
}
KASSERT(grp->il_inpcnt < grp->il_inpsiz,
("invalid local group size %d and count %d",
grp->il_inpsiz, grp->il_inpcnt));
("invalid local group size %d and count %d", grp->il_inpsiz,
grp->il_inpcnt));
grp->il_inp[grp->il_inpcnt] = inp;
grp->il_inpcnt++;