These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / lustre / include / linux / lnet / api.h

diff --git a/kernel/drivers/staging/lustre/include/linux/lnet/api.h b/kernel/drivers/staging/lustre/include/linux/lnet/api.h
index cd86517..9493d5e 100644 (file)
--- a/kernel/drivers/staging/lustre/include/linux/lnet/api.h
+++ b/kernel/drivers/staging/lustre/include/linux/lnet/api.h
@@ -15,21 +15,19 @@
  *
  * 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
  */
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011 - 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
+ * Lustre is a trademark of Seagate, Inc.
  */
 
 #ifndef __LNET_API_H__
@@ -41,9 +39,8 @@
  *
  * LNet is an asynchronous message-passing API, which provides an unreliable
  * connectionless service that can't guarantee any order. It supports OFA IB,
- * TCP/IP, and Cray Portals, and routes between heterogeneous networks.
+ * TCP/IP, and Cray Interconnects, and routes between heterogeneous networks.
  *
- * LNet can run both in OS kernel space and in userspace as a library.
  * @{
  */
 
@@ -52,9 +49,6 @@
 /** \defgroup lnet_init_fini Initialization and cleanup
  * The LNet must be properly initialized before any LNet calls can be made.
  * @{ */
-int LNetInit(void);
-void LNetFini(void);
-
 int LNetNIInit(lnet_pid_t requested_pid);
 int LNetNIFini(void);
 /** @} lnet_init_fini */
@@ -98,16 +92,16 @@ void LNetSnprintHandle(char *str, int str_len, lnet_handle_any_t handle);
  * @{ */
 int LNetMEAttach(unsigned int      portal,
                 lnet_process_id_t match_id_in,
-                __u64       match_bits_in,
-                __u64       ignore_bits_in,
+                __u64             match_bits_in,
+                __u64             ignore_bits_in,
                 lnet_unlink_t     unlink_in,
                 lnet_ins_pos_t    pos_in,
                 lnet_handle_me_t *handle_out);
 
 int LNetMEInsert(lnet_handle_me_t  current_in,
                 lnet_process_id_t match_id_in,
-                __u64       match_bits_in,
-                __u64       ignore_bits_in,
+                __u64             match_bits_in,
+                __u64             ignore_bits_in,
                 lnet_unlink_t     unlink_in,
                 lnet_ins_pos_t    position_in,
                 lnet_handle_me_t *handle_out);
@@ -128,13 +122,13 @@ int LNetMEUnlink(lnet_handle_me_t current_in);
  * associated with a MD: LNetMDUnlink().
  * @{ */
 int LNetMDAttach(lnet_handle_me_t  current_in,
-                lnet_md_t       md_in,
+                lnet_md_t         md_in,
                 lnet_unlink_t     unlink_in,
                 lnet_handle_md_t *handle_out);
 
-int LNetMDBind(lnet_md_t        md_in,
-              lnet_unlink_t     unlink_in,
-              lnet_handle_md_t *handle_out);
+int LNetMDBind(lnet_md_t          md_in,
+              lnet_unlink_t       unlink_in,
+              lnet_handle_md_t   *handle_out);
 
 int LNetMDUnlink(lnet_handle_md_t md_in);
 /** @} lnet_md */
@@ -174,10 +168,10 @@ int LNetEQWait(lnet_handle_eq_t  eventq_in,
               lnet_event_t     *event_out);
 
 int LNetEQPoll(lnet_handle_eq_t *eventqs_in,
-              int             neq_in,
-              int             timeout_ms,
+              int               neq_in,
+              int               timeout_ms,
               lnet_event_t     *event_out,
-              int            *which_eq_out);
+              int              *which_eq_out);
 /** @} lnet_eq */
 
 /** \defgroup lnet_data Data movement operations
@@ -185,20 +179,20 @@ int LNetEQPoll(lnet_handle_eq_t *eventqs_in,
  * The LNet API provides two data movement operations: LNetPut()
  * and LNetGet().
  * @{ */
-int LNetPut(lnet_nid_t self,
+int LNetPut(lnet_nid_t       self,
            lnet_handle_md_t  md_in,
            lnet_ack_req_t    ack_req_in,
            lnet_process_id_t target_in,
            unsigned int      portal_in,
-           __u64            match_bits_in,
+           __u64             match_bits_in,
            unsigned int      offset_in,
-           __u64            hdr_data_in);
+           __u64             hdr_data_in);
 
-int LNetGet(lnet_nid_t self,
+int LNetGet(lnet_nid_t       self,
            lnet_handle_md_t  md_in,
            lnet_process_id_t target_in,
            unsigned int      portal_in,
-           __u64            match_bits_in,
+           __u64             match_bits_in,
            unsigned int      offset_in);
 /** @} lnet_data */
 
@@ -209,7 +203,6 @@ int LNetGet(lnet_nid_t      self,
 int LNetSetLazyPortal(int portal);
 int LNetClearLazyPortal(int portal);
 int LNetCtl(unsigned int cmd, void *arg);
-int LNetSetAsync(lnet_process_id_t id, int nasync);
 
 /** @} lnet_misc */