LU-13004 ptlrpc: simplify bd_vec access.

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

diff --git a/lustre/ptlrpc/pers.c b/lustre/ptlrpc/pers.c
index 7b27b77..4566d88 100644 (file)
--- a/lustre/ptlrpc/pers.c
+++ b/lustre/ptlrpc/pers.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * 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/
@@ -45,10 +41,10 @@
 #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);
+       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);
@@ -58,21 +54,12 @@ void ptlrpc_fill_bulk_md(lnet_md_t *md, struct ptlrpc_bulk_desc *desc,
        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)) {
-               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->options |= LNET_MD_KIOV;
+       if (desc->bd_enc_vec)
+               md->start = &desc->bd_enc_vec[mdidx *
+                                             LNET_MAX_IOV];
+       else
+               md->start = &desc->bd_vec[mdidx * LNET_MAX_IOV];
 }