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>
])
])
-# 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
#
# 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
}
#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);