luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CCID2]: Remove ugly BUG_ON

Browse Source 
This removes an ugly BUG_ON which has been pointed out by Arnaldo.

Instead of freezing up the machine, a `critical' message is now issued
to the system log.

There is potential of doing this more gracefully (eg. there are a few
internal variables which could be updated despite the lack of memory),
but that requires more complicated changes to the algorithm; thus a
`FIXME' has been added.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Gerrit Renker 2007-10-04 14:41:26 -07:00 committed by David S. Miller
parent cd1f7d347c
commit 7d9e8931f9
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/dccp/ccids/ccid2.c
View File

@ -294,12 +294,11 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len)
next = hctx->ccid2hctx_seqh->ccid2s_next; next = hctx->ccid2hctx_seqh->ccid2s_next;
/* check if we need to alloc more space */ /* check if we need to alloc more space */
if (next == hctx->ccid2hctx_seqt) { if (next == hctx->ccid2hctx_seqt) {
int rc; if (ccid2_hc_tx_alloc_seq(hctx)) {
DCCP_CRIT("packet history - out of memory!");
ccid2_pr_debug("allocating more space in history\n"); /* FIXME: find a more graceful way to bail out */
rc = ccid2_hc_tx_alloc_seq(hctx); return;
BUG_ON(rc); /* XXX what do we do? */ }
next = hctx->ccid2hctx_seqh->ccid2s_next; next = hctx->ccid2hctx_seqh->ccid2s_next;
BUG_ON(next == hctx->ccid2hctx_seqt); BUG_ON(next == hctx->ccid2hctx_seqt);
} }