LU-17867 ko2iblnd: gcc bug work around

[fs/lustre-release.git] / lustre / ptlrpc / pers.c

diff --git a/lustre/ptlrpc/pers.c b/lustre/ptlrpc/pers.c
index 422aa01..45af603 100644 (file)
--- a/lustre/ptlrpc/pers.c
+++ b/lustre/ptlrpc/pers.c
@@ -23,11 +23,10 @@
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2014, 2015, Intel Corporation.
+ * Copyright (c) 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #define DEBUG_SUBSYSTEM S_RPC
@@ -41,34 +40,37 @@
 #include "ptlrpc_internal.h"
 
 
-void ptlrpc_fill_bulk_md(lnet_md_t *md, struct ptlrpc_bulk_desc *desc,
+void ptlrpc_fill_bulk_md(struct lnet_md *md, struct ptlrpc_bulk_desc *desc,
                         int mdidx)
 {
-       CLASSERT(PTLRPC_MAX_BRW_PAGES < LI_POISON);
+       unsigned int start = desc->bd_mds_off[mdidx];
+
+       BUILD_BUG_ON(PTLRPC_MAX_BRW_PAGES >= LI_POISON);
 
        LASSERT(mdidx < desc->bd_md_max_brw);
        LASSERT(desc->bd_iov_count <= PTLRPC_MAX_BRW_PAGES);
-       LASSERT(!(md->options & (LNET_MD_IOVEC | LNET_MD_KIOV |
-                                LNET_MD_PHYS)));
-
-       md->length = max(0, desc->bd_iov_count - mdidx * LNET_MAX_IOV);
-       md->length = min_t(unsigned int, LNET_MAX_IOV, md->length);
 
-       if (ptlrpc_is_bulk_desc_kiov(desc->bd_type)) {
+       /* just send a lnet header */
+       if (mdidx >= desc->bd_md_count) {
                md->options |= LNET_MD_KIOV;
-               if (GET_ENC_KIOV(desc))
-                       md->start = &BD_GET_ENC_KIOV(desc, mdidx *
-                                                    LNET_MAX_IOV);
-               else
-                       md->start = &BD_GET_KIOV(desc, mdidx * LNET_MAX_IOV);
-       } else if (ptlrpc_is_bulk_desc_kvec(desc->bd_type)) {
-               md->options |= LNET_MD_IOVEC;
-               if (GET_ENC_KVEC(desc))
-                       md->start = &BD_GET_ENC_KVEC(desc, mdidx *
-                                                     LNET_MAX_IOV);
-               else
-                       md->start = &BD_GET_KVEC(desc, mdidx * LNET_MAX_IOV);
+               md->length = 0;
+               md->start = NULL;
+               return;
        }
+
+       if (desc->bd_is_rdma)
+               md->options |= LNET_MD_GPU_ADDR;
+
+       if (mdidx == (desc->bd_md_count - 1))
+               md->length = desc->bd_iov_count - start;
+       else
+               md->length = desc->bd_mds_off[mdidx + 1] - start;
+
+       md->options |= LNET_MD_KIOV;
+       if (desc->bd_enc_vec)
+               md->start = &desc->bd_enc_vec[start];
+       else
+               md->start = &desc->bd_vec[start];
 }