init rq_history_list before use.

b=15412
i=johann
i=deen

diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index a797029..6e13803 100644 (file)
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -375,6 +375,7 @@ static int __ptlrpc_request_bufs_pack(struct ptlrpc_request *request,
         CFS_INIT_LIST_HEAD(&request->rq_mod_list);
         CFS_INIT_LIST_HEAD(&request->rq_ctx_chain);
         CFS_INIT_LIST_HEAD(&request->rq_set_chain);
+        CFS_INIT_LIST_HEAD(&request->rq_history_list);
         cfs_waitq_init(&request->rq_reply_waitq);
         request->rq_xid = ptlrpc_next_xid();
         atomic_set(&request->rq_refcount, 1);

diff --git a/lustre/ptlrpc/sec_bulk.c b/lustre/ptlrpc/sec_bulk.c
index 22ed4ff..a161e83 100644 (file)
--- a/lustre/ptlrpc/sec_bulk.c
+++ b/lustre/ptlrpc/sec_bulk.c
@@ -868,7 +868,7 @@ static int do_bulk_checksum_adler32(struct ptlrpc_bulk_desc *desc, void *buf)
                 ptr = cfs_kmap(page) + off;
                 len = desc->bd_iov[i].kiov_len;
 
-                adler32 = zlib_adler32(adler32, ptr, len);
+                adler32 = adler32(adler32, ptr, len);
 
                 cfs_kunmap(page);
         }
@@ -976,7 +976,7 @@ static int do_bulk_checksum(struct ptlrpc_bulk_desc *desc, __u32 alg, void *buf)
                 switch (alg) {
                 case BULK_HASH_ALG_ADLER32:
 #ifdef HAVE_ADLER
-                        csum32 = zlib_adler32(csum32, ptr, len);
+                        csum32 = adler32(csum32, ptr, len);
 #else
                         CERROR("Adler32 not supported\n");
                         return -EINVAL;