From: James Simmons <uja.ornl@gmail.com>
Date: Wed, 11 Sep 2013 17:07:17 +0000 (-0400)
Subject: LU-2800 autoconf: remove LIBCFS_SOCK_MAP_FD_2ARG
X-Git-Tag: 2.5.51~40
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=5b23d31251f836ff64bd00c6abb8bab0e6c834ee;p=fs%2Flustre-release.git

LU-2800 autoconf: remove LIBCFS_SOCK_MAP_FD_2ARG

v2.6.27 added a second argument to sock_map_fd. Earlier versions are
out of scope so we can remove the test for the number of arguments.

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Change-Id: I4e12da8c102b5d682db9658187330ae601b00a21
Reviewed-on: http://review.whamcloud.com/5406
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
---

diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
index 9703991..f3ffc07 100644
--- a/libcfs/autoconf/lustre-libcfs.m4
+++ b/libcfs/autoconf/lustre-libcfs.m4
@@ -100,22 +100,6 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
-# 2.6.27 have second argument to sock_map_fd
-AC_DEFUN([LIBCFS_SOCK_MAP_FD_2ARG],
-[AC_MSG_CHECKING([sock_map_fd have second argument])
-LB_LINUX_TRY_COMPILE([
-	#include <linux/net.h>
-],[
-        sock_map_fd(NULL, 0);
-],[
-        AC_MSG_RESULT(yes)
-        AC_DEFINE(HAVE_SOCK_MAP_FD_2ARG, 1,
-                  [sock_map_fd have second argument])
-],[
-        AC_MSG_RESULT(NO)
-])
-])
-
 #
 # LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK
 #
@@ -318,8 +302,6 @@ LIBCFS_U64_LONG_LONG_LINUX
 # 2.6.24
 LIBCFS_SYSCTL_UNNUMBERED
 LIBCFS_HAVE_KEYTYPE_H
-# 2.6.30
-LIBCFS_SOCK_MAP_FD_2ARG
 # 2.6.32
 LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK
 LC_SHRINKER_WANT_SHRINK_PTR
diff --git a/libcfs/libcfs/linux/linux-tcpip.c b/libcfs/libcfs/linux/linux-tcpip.c
index 18bfd3f..200f6be 100644
--- a/libcfs/libcfs/linux/linux-tcpip.c
+++ b/libcfs/libcfs/linux/linux-tcpip.c
@@ -67,11 +67,7 @@ libcfs_sock_ioctl(int cmd, unsigned long arg)
         }
 
 #if !defined(HAVE_SOCK_ALLOC_FILE) && !defined(HAVE_SOCK_ALLOC_FILE_3ARGS)
-# ifdef HAVE_SOCK_MAP_FD_2ARG
-	fd = sock_map_fd(sock,0);
-# else
-	fd = sock_map_fd(sock);
-# endif
+	fd = sock_map_fd(sock, 0);
 	if (fd < 0) {
 		rc = fd;
 		sock_release(sock);