LU-6027 mdd: Don't list "trusted.link" for orphans

[fs/lustre-release.git] / lnet / include / lnet / linux / lnet.h

diff --git a/lnet/include/lnet/linux/lnet.h b/lnet/include/lnet/linux/lnet.h
index d6bf5ad..d641bce 100644 (file)
--- a/lnet/include/lnet/linux/lnet.h
+++ b/lnet/include/lnet/linux/lnet.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -16,8 +14,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * 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
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -50,6 +50,14 @@
 #if defined (__KERNEL__)
 #include <linux/uio.h>
 #include <linux/types.h>
+
+#ifdef HAVE_TCP_SENDPAGE_USE_SOCKET
+#define cfs_tcp_sendpage(sk, page, offset, size, flags) \
+        tcp_sendpage((sk)->sk_socket, page, offset, size, flags)
+#else
+#define cfs_tcp_sendpage(sk, page, offset, size, flags) \
+        tcp_sendpage(sk, page, offset, size, flags)
+#endif
 #else
 #include <sys/types.h>
 #include <sys/uio.h>