LU-13375 flr: inherit the correct layout by "mirror extend -N"

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

diff --git a/lustre/ptlrpc/pers.c b/lustre/ptlrpc/pers.c
index 18fb720..7183e37 100644 (file)
--- a/lustre/ptlrpc/pers.c
+++ b/lustre/ptlrpc/pers.c
@@ -48,18 +48,17 @@ void ptlrpc_fill_bulk_md(struct lnet_md *md, struct ptlrpc_bulk_desc *desc,
 
        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)));
+       LASSERT(!(md->options & (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);
 
        md->options |= LNET_MD_KIOV;
-       if (GET_ENC_KIOV(desc))
-               md->start = &BD_GET_ENC_KIOV(desc, mdidx *
-                                            LNET_MAX_IOV);
+       if (desc->bd_enc_vec)
+               md->start = &desc->bd_enc_vec[mdidx *
+                                             LNET_MAX_IOV];
        else
-               md->start = &BD_GET_KIOV(desc, mdidx * LNET_MAX_IOV);
+               md->start = &desc->bd_vec[mdidx * LNET_MAX_IOV];
 }