X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fpers.c;h=4a66fb8abe3c8216046cde9fadcb3bea4ff56c42;hb=b046468f58a1f40e85cb59ed9abf75fd2fd5ea5a;hp=7fcccd2f2c10f15c42c5787fc8f5f7e0e7c11512;hpb=57e6d88a8a8d858e2d74aeefba4c764ad08cf86d;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/pers.c b/lustre/ptlrpc/pers.c
index 7fcccd2..4a66fb8 100644
--- a/lustre/ptlrpc/pers.c
+++ b/lustre/ptlrpc/pers.c
@@ -1,86 +1,78 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
  *
- *  Copyright (c) 2004 Cluster File Systems, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * 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
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, 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
-#ifndef __KERNEL__
-#include <errno.h>
-#include <signal.h>
-#include <liblustre.h>
-#endif
 
-#include <linux/obd_support.h>
-#include <linux/obd_class.h>
-#include <linux/lustre_lib.h>
-#include <linux/lustre_ha.h>
-#include <linux/lustre_import.h>
+#include <obd_support.h>
+#include <obd_class.h>
+#include <lustre_lib.h>
+#include <lustre_ha.h>
+#include <lustre_import.h>
 
 #include "ptlrpc_internal.h"
 
-#ifdef __KERNEL__
-#ifndef CRAY_PORTALS
-void pers_bulk_add_page(struct ptlrpc_bulk_desc *desc, struct page *page,
-                        int pageoffset, int len)
-{
-        ptl_kiov_t *kiov = &desc->bd_iov[desc->bd_iov_count];
-
-        kiov->kiov_page = page;
-        kiov->kiov_offset = pageoffset;
-        kiov->kiov_len = len;
 
-        desc->bd_iov_count++;
-}
-#else
-void pers_bulk_add_page(struct ptlrpc_bulk_desc *desc, struct page *page,
-                        int pageoffset, int len)
+void ptlrpc_fill_bulk_md(lnet_md_t *md, struct ptlrpc_bulk_desc *desc,
+			 int mdidx)
 {
-        struct iovec *iov = &desc->bd_iov[desc->bd_iov_count];
-
-        /* Should get a compiler warning if sizeof(physaddr) > sizeof(void *) */
-        iov->iov_base = (void *)(page_to_phys(page) + pageoffset);
-        iov->iov_len = len;
+	CLASSERT(PTLRPC_MAX_BRW_PAGES < LI_POISON);
 
-        desc->bd_iov_count++;
-}
-#endif
+	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)));
 
-#else /* !__KERNEL__ */
+	md->length = max(0, desc->bd_iov_count - mdidx * LNET_MAX_IOV);
+	md->length = min_t(unsigned int, LNET_MAX_IOV, md->length);
 
-int can_merge_iovs(struct iovec *existing, struct iovec *candidate)
-{
-        if (existing->iov_base + existing->iov_len == candidate->iov_base)
-                return 1;
-        return 0;
+	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);
+	}
 }
-void pers_bulk_add_page(struct ptlrpc_bulk_desc *desc, struct page *page, 
-                        int pageoffset, int len)
-{
-        struct iovec *iov = &desc->bd_iov[desc->bd_iov_count];
 
-        iov->iov_base = page->addr + pageoffset;
-        iov->iov_len = len;
 
-        if (desc->bd_iov_count > 0 && can_merge_iovs(iov - 1, iov)) {
-                (iov - 1)->iov_len += len;
-        } else {
-                desc->bd_iov_count++;
-        }
-}
-#endif