LU-10157 ptlrpc: fill md correctly.

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

diff --git a/lustre/ptlrpc/pers.c b/lustre/ptlrpc/pers.c
index 51e17e2..d0c8fa7 100644 (file)
--- a/lustre/ptlrpc/pers.c
+++ b/lustre/ptlrpc/pers.c
@@ -44,6 +44,8 @@
 void ptlrpc_fill_bulk_md(struct lnet_md *md, struct ptlrpc_bulk_desc *desc,
                         int mdidx)
 {
+       unsigned int start = desc->bd_mds_off[mdidx];
+
        CLASSERT(PTLRPC_MAX_BRW_PAGES < LI_POISON);
 
        LASSERT(mdidx < desc->bd_md_max_brw);
@@ -51,23 +53,34 @@ void ptlrpc_fill_bulk_md(struct lnet_md *md, struct ptlrpc_bulk_desc *desc,
        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);
+       /* just send a lnet header */
+       if (mdidx >= desc->bd_md_count) {
+               if (ptlrpc_is_bulk_desc_kiov(desc->bd_type))
+                       md->options |= LNET_MD_KIOV;
+               else if (ptlrpc_is_bulk_desc_kvec(desc->bd_type))
+                       md->options |= LNET_MD_IOVEC;
+               md->length = 0;
+               md->start = NULL;
+               return;
+       }
+
+       if (mdidx == (desc->bd_md_count - 1))
+               md->length = desc->bd_iov_count - start;
+       else
+               md->length = desc->bd_mds_off[mdidx + 1] - start;
 
        if (ptlrpc_is_bulk_desc_kiov(desc->bd_type)) {
                md->options |= LNET_MD_KIOV;
                if (GET_ENC_KIOV(desc))
-                       md->start = &BD_GET_ENC_KIOV(desc, mdidx *
-                                                    LNET_MAX_IOV);
+                       md->start = &BD_GET_ENC_KIOV(desc, start);
                else
-                       md->start = &BD_GET_KIOV(desc, mdidx * LNET_MAX_IOV);
+                       md->start = &BD_GET_KIOV(desc, start);
        } 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);
+                       md->start = &BD_GET_ENC_KVEC(desc, start);
                else
-                       md->start = &BD_GET_KVEC(desc, mdidx * LNET_MAX_IOV);
+                       md->start = &BD_GET_KVEC(desc, start);
        }
 }