Remove utsname() wrapper

There is no longer a need to wrap this because utsname() is provided
by the kernel and can be called directly.  This will require a small
change in the ZFS code because utsname is expected to be a global
structure and not a function.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/config/spl-build.m4 b/config/spl-build.m4
index d8cc018de21b545fe0152c10307d684810cfa940..ba9902599b99ecc210a22baee283a38a9266f853 100644 (file)
--- a/config/spl-build.m4
+++ b/config/spl-build.m4
@@ -36,7 +36,6 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [
        SPL_AC_SET_NORMALIZED_TIMESPEC_EXPORT
        SPL_AC_SET_NORMALIZED_TIMESPEC_INLINE
        SPL_AC_TIMESPEC_SUB
-       SPL_AC_INIT_UTSNAME
        SPL_AC_UACCESS_HEADER
        SPL_AC_KMALLOC_NODE
        SPL_AC_MONOTONIC_CLOCK
@@ -1114,25 +1113,6 @@ AC_DEFUN([SPL_AC_TIMESPEC_SUB], [
        ])
 ])
 
-dnl #
-dnl # 2.6.19 API change,
-dnl # check if init_utsname() is available in linux/utsname.h
-dnl #
-AC_DEFUN([SPL_AC_INIT_UTSNAME], [
-       AC_MSG_CHECKING([whether init_utsname() is available])
-       SPL_LINUX_TRY_COMPILE([
-               #include <linux/utsname.h>
-       ],[
-               struct new_utsname *a __attribute__ ((unused));
-               a = init_utsname();
-       ],[
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_INIT_UTSNAME, 1, [init_utsname() is available])
-       ],[
-               AC_MSG_RESULT(no)
-       ])
-])
-
 dnl #
 dnl # 2.6.18 API change,
 dnl # added linux/uaccess.h

diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
index 9d8263657aac56359f17644519bf608d8ba4d8c5..985c513193ed8e8beb92e1a55fe9f98312681068 100644 (file)
--- a/include/sys/Makefile.am
+++ b/include/sys/Makefile.am
@@ -90,7 +90,6 @@ KERNEL_H = \
        $(top_srcdir)/include/sys/u8_textprep.h \
        $(top_srcdir)/include/sys/uio.h \
        $(top_srcdir)/include/sys/unistd.h \
-       $(top_srcdir)/include/sys/utsname.h \
        $(top_srcdir)/include/sys/va_list.h \
        $(top_srcdir)/include/sys/varargs.h \
        $(top_srcdir)/include/sys/vfs.h \

diff --git a/include/sys/utsname.h b/include/sys/utsname.h
deleted file mode 100644 (file)
index 3d979c1..0000000
--- a/include/sys/utsname.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*****************************************************************************\
- *  Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC.
- *  Copyright (C) 2007 The Regents of the University of California.
- *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- *  Written by Brian Behlendorf <behlendorf1@llnl.gov>.
- *  UCRL-CODE-235197
- *
- *  This file is part of the SPL, Solaris Porting Layer.
- *  For details, see <http://zfsonlinux.org/>.
- *
- *  The SPL is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License as published by the
- *  Free Software Foundation; either version 2 of the License, or (at your
- *  option) any later version.
- *
- *  The SPL is distributed in the hope that it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *  for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with the SPL.  If not, see <http://www.gnu.org/licenses/>.
-\*****************************************************************************/
-
-#ifndef _SPL_UTSNAME_H
-#define _SPL_UTSNAME_H
-
-#include <linux/utsname.h>
-
-extern struct new_utsname *__utsname(void);
-
-#define utsname                        (*__utsname())
-
-#endif /* SPL_UTSNAME_H */

diff --git a/module/spl/spl-generic.c b/module/spl/spl-generic.c
index 039ee73198872a95e14f55b9cc2e6eadaaddfa81..3e8f874de744ac95133eb7234ce569c3c4a9d809 100644 (file)
--- a/module/spl/spl-generic.c
+++ b/module/spl/spl-generic.c
@@ -37,7 +37,6 @@
 #include <sys/debug.h>
 #include <sys/proc.h>
 #include <sys/kstat.h>
-#include <sys/utsname.h>
 #include <sys/file.h>
 #include <linux/kmod.h>
 #include <linux/proc_compat.h>
@@ -438,17 +437,6 @@ __put_task_struct(struct task_struct *t)
 EXPORT_SYMBOL(__put_task_struct);
 #endif /* HAVE_PUT_TASK_STRUCT */
 
-struct new_utsname *__utsname(void)
-{
-#ifdef HAVE_INIT_UTSNAME
-       return init_utsname();
-#else
-       return &system_utsname;
-#endif
-}
-EXPORT_SYMBOL(__utsname);
-
-
 /*
  * Read the unique system identifier from the /etc/hostid file.
  *