bridge: Don't sleep during epoch
While it doesn't trigger INVARIANTS or WITNESS on head it does in stable/12. There's also no reason for it, as we can easily report the out of memory error to the caller (i.e. userspace). All of these can already fail. PR: 248046 MFC after: 3 days
This commit is contained in:
parent
d5c5b4b382
commit
93ed6ade6e
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=363308
@ -1393,9 +1393,9 @@ bridge_ioctl_gifs(struct bridge_softc *sc, void *arg)
|
|||||||
bifc->ifbic_len = buflen;
|
bifc->ifbic_len = buflen;
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
BRIDGE_UNLOCK(sc);
|
outbuf = malloc(buflen, M_TEMP, M_NOWAIT | M_ZERO);
|
||||||
outbuf = malloc(buflen, M_TEMP, M_WAITOK | M_ZERO);
|
if (outbuf == NULL)
|
||||||
BRIDGE_LOCK(sc);
|
return (ENOMEM);
|
||||||
|
|
||||||
count = 0;
|
count = 0;
|
||||||
buf = outbuf;
|
buf = outbuf;
|
||||||
@ -1455,9 +1455,9 @@ bridge_ioctl_rts(struct bridge_softc *sc, void *arg)
|
|||||||
count++;
|
count++;
|
||||||
buflen = sizeof(bareq) * count;
|
buflen = sizeof(bareq) * count;
|
||||||
|
|
||||||
BRIDGE_UNLOCK(sc);
|
outbuf = malloc(buflen, M_TEMP, M_NOWAIT | M_ZERO);
|
||||||
outbuf = malloc(buflen, M_TEMP, M_WAITOK | M_ZERO);
|
if (outbuf == NULL)
|
||||||
BRIDGE_LOCK(sc);
|
return (ENOMEM);
|
||||||
|
|
||||||
count = 0;
|
count = 0;
|
||||||
buf = outbuf;
|
buf = outbuf;
|
||||||
@ -1783,9 +1783,9 @@ bridge_ioctl_gifsstp(struct bridge_softc *sc, void *arg)
|
|||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
BRIDGE_UNLOCK(sc);
|
outbuf = malloc(buflen, M_TEMP, M_NOWAIT | M_ZERO);
|
||||||
outbuf = malloc(buflen, M_TEMP, M_WAITOK | M_ZERO);
|
if (outbuf == NULL)
|
||||||
BRIDGE_LOCK(sc);
|
return (ENOMEM);
|
||||||
|
|
||||||
count = 0;
|
count = 0;
|
||||||
buf = outbuf;
|
buf = outbuf;
|
||||||
|
Loading…
Reference in New Issue
Block a user