From 9d17ef3b69368910ba830a47872ac7f8e887ecc6 Mon Sep 17 00:00:00 2001 From: eeb Date: Wed, 18 Jun 2003 22:08:38 +0000 Subject: [PATCH] * 1439 fix --- lnet/klnds/qswlnd/qswlnd.h | 2 +- lnet/klnds/qswlnd/qswlnd_cb.c | 1 + lustre/portals/knals/qswnal/qswnal.h | 2 +- lustre/portals/knals/qswnal/qswnal_cb.c | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lnet/klnds/qswlnd/qswlnd.h b/lnet/klnds/qswlnd/qswlnd.h index 88ab74f..85e585b 100644 --- a/lnet/klnds/qswlnd/qswlnd.h +++ b/lnet/klnds/qswlnd/qswlnd.h @@ -104,7 +104,7 @@ typedef unsigned long kqsw_csum_t; #define KQSW_TX_MAXCONTIG (1<<10) /* largest payload that gets made contiguous on transmit */ #define KQSW_NTXMSGS 8 /* # normal transmit messages */ -#define KQSW_NNBLK_TXMSGS 128 /* # reserved transmit messages if can't block */ +#define KQSW_NNBLK_TXMSGS 256 /* # reserved transmit messages if can't block */ #define KQSW_NRXMSGS_LARGE 64 /* # large receive buffers */ #define KQSW_EP_ENVELOPES_LARGE 128 /* # large ep envelopes */ diff --git a/lnet/klnds/qswlnd/qswlnd_cb.c b/lnet/klnds/qswlnd/qswlnd_cb.c index 3b47a25..c03d592 100644 --- a/lnet/klnds/qswlnd/qswlnd_cb.c +++ b/lnet/klnds/qswlnd/qswlnd_cb.c @@ -617,6 +617,7 @@ kqswnal_sendmsg (nal_cb_t *nal, if (ktx == NULL) { kqswnal_cerror_hdr (hdr); lib_finalize (&kqswnal_lib, private, cookie); + return (-1); } memcpy (ktx->ktx_buffer, hdr, sizeof (*hdr)); /* copy hdr from caller's stack */ diff --git a/lustre/portals/knals/qswnal/qswnal.h b/lustre/portals/knals/qswnal/qswnal.h index 88ab74f..85e585b 100644 --- a/lustre/portals/knals/qswnal/qswnal.h +++ b/lustre/portals/knals/qswnal/qswnal.h @@ -104,7 +104,7 @@ typedef unsigned long kqsw_csum_t; #define KQSW_TX_MAXCONTIG (1<<10) /* largest payload that gets made contiguous on transmit */ #define KQSW_NTXMSGS 8 /* # normal transmit messages */ -#define KQSW_NNBLK_TXMSGS 128 /* # reserved transmit messages if can't block */ +#define KQSW_NNBLK_TXMSGS 256 /* # reserved transmit messages if can't block */ #define KQSW_NRXMSGS_LARGE 64 /* # large receive buffers */ #define KQSW_EP_ENVELOPES_LARGE 128 /* # large ep envelopes */ diff --git a/lustre/portals/knals/qswnal/qswnal_cb.c b/lustre/portals/knals/qswnal/qswnal_cb.c index 3b47a25..c03d592 100644 --- a/lustre/portals/knals/qswnal/qswnal_cb.c +++ b/lustre/portals/knals/qswnal/qswnal_cb.c @@ -617,6 +617,7 @@ kqswnal_sendmsg (nal_cb_t *nal, if (ktx == NULL) { kqswnal_cerror_hdr (hdr); lib_finalize (&kqswnal_lib, private, cookie); + return (-1); } memcpy (ktx->ktx_buffer, hdr, sizeof (*hdr)); /* copy hdr from caller's stack */ -- 1.8.3.1