From 2488560926e630cef012ee8ab37e97e7499b0f75 Mon Sep 17 00:00:00 2001 From: ericm Date: Thu, 2 Nov 2006 21:29:20 +0000 Subject: [PATCH] branch: b_new_cmd fix assertion: enc pages might be allocated by previous failed bulk rpc. --- lustre/ptlrpc/sec_bulk.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lustre/ptlrpc/sec_bulk.c b/lustre/ptlrpc/sec_bulk.c index 8099711..9bb66b2 100644 --- a/lustre/ptlrpc/sec_bulk.c +++ b/lustre/ptlrpc/sec_bulk.c @@ -368,10 +368,13 @@ int sptlrpc_enc_pool_get_pages(struct ptlrpc_bulk_desc *desc) int p_idx, g_idx; int i; - LASSERT(desc->bd_enc_pages == NULL); LASSERT(desc->bd_max_iov > 0); LASSERT(desc->bd_max_iov <= page_pools.epp_total_pages); + /* resent bulk, enc pages might have been allocated previously */ + if (desc->bd_enc_pages != NULL) + return 0; + OBD_ALLOC(desc->bd_enc_pages, desc->bd_max_iov * sizeof(*desc->bd_enc_pages)); if (desc->bd_enc_pages == NULL) -- 1.8.3.1