b=20722 Fix watchdog timer messages to be more clear.

[fs/lustre-release.git] / libcfs / libcfs / linux / linux-tcpip.c

diff --git a/libcfs/libcfs/linux/linux-tcpip.c b/libcfs/libcfs/linux/linux-tcpip.c
index e104687..0ac56c6 100644 (file)
--- a/libcfs/libcfs/linux/linux-tcpip.c
+++ b/libcfs/libcfs/linux/linux-tcpip.c
@@ -16,8 +16,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
@@ -63,7 +63,11 @@ libcfs_sock_ioctl(int cmd, unsigned long arg)
                 return rc;
         }
 
+#ifdef HAVE_SOCK_MAP_FD_2ARG
+        fd = sock_map_fd(sock,0);
+#else
         fd = sock_map_fd(sock);
+#endif
         if (fd < 0) {
                 rc = fd;
                 sock_release(sock);