From e631cff898728c4c9c2c074c187acf4114b7396a Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 15 Dec 2008 10:28:14 -0800 Subject: [PATCH] Remove lustre config, we really shouldn't need this. A user space build -should- be able to contain all the needed APIs. If this is not the case we can reintroduce this. --- README | 25 ++----------------------- config/Makefile.am | 2 +- config/lustre.m4 | 4 ---- config/zfs-build.m4 | 9 +++++---- configure.ac | 14 +------------- scripts/create-zpool.sh | 8 ++++---- 6 files changed, 13 insertions(+), 49 deletions(-) delete mode 100644 config/lustre.m4 diff --git a/README b/README index b25659dd4e..f73f9ff677 100644 --- a/README +++ b/README @@ -32,31 +32,10 @@ make make check -============================ ZFS LUSTRE BUILD ============================ - -1) Build the SPL (Solaris Porting Layer) module which is designed to - provide many Solaris APIs in the Linux kernel which are needed - by ZFS. To build the SPL: - - tar -xzf spl-x.y.z.tgz - cd spl-x.y.z - ./configure --with-linux= - make - make check - -2) Build ZFS, this port is based on build 89 of ZFS from OpenSolaris. - To build ZFS as a userspace library for use by a Lustre filesystem: - - tar -xzf zfs-x.y.z.tgz - cd zfs-x.y.z - ./configure --zfsconfig=lustre \ - --with-linux= \ - --with-spl= - make - make check +============================ ZPIOS TEST SUITE ============================ 3) Provided is an in-kernel test application called zpios which can be - used to simulate a Lustre IO load. It may be used as a stress test + used to simulate a parallel IO load. It may be used as a stress test or as a performance to measure your configuration. To simplify testing there are scripts provided in the scripts/ directory. A single test can be run as follows: diff --git a/config/Makefile.am b/config/Makefile.am index 257d60f149..2d77282c19 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -1 +1 @@ -EXTRA_DIST = zfs-build.m4 zfs-meta.m4 kernel.m4 lustre.m4 user.m4 Rules.am +EXTRA_DIST = zfs-build.m4 zfs-meta.m4 kernel.m4 user.m4 Rules.am diff --git a/config/lustre.m4 b/config/lustre.m4 deleted file mode 100644 index eee871cf96..0000000000 --- a/config/lustre.m4 +++ /dev/null @@ -1,4 +0,0 @@ -dnl # -dnl # Default ZFS lustre configuration -dnl # -AC_DEFUN([ZFS_AC_CONFIG_LUSTRE], []) diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 index 6df90696d3..074018207e 100644 --- a/config/zfs-build.m4 +++ b/config/zfs-build.m4 @@ -238,7 +238,7 @@ AC_DEFUN([ZFS_AC_CONFIG], [ AC_ARG_WITH([zfs-config], AS_HELP_STRING([--with-config=CONFIG], - [Config file 'kernel|user|lustre']), + [Config file 'kernel|user|all']), [zfsconfig="$withval"]) AC_MSG_CHECKING([zfs config]) @@ -246,12 +246,13 @@ AC_DEFUN([ZFS_AC_CONFIG], [ case "$zfsconfig" in kernel) ZFS_AC_CONFIG_KERNEL ;; - user) ZFS_AC_CONFIG_USER ;; - lustre) ZFS_AC_CONFIG_LUSTRE ;; + user) ZFS_AC_CONFIG_USER ;; + all) ZFS_AC_CONFIG_KERNEL + ZFS_AC_CONFIG_USER ;; *) AC_MSG_RESULT([Error!]) AC_MSG_ERROR([Bad value "$zfsconfig" for --with-config, - user kernel|user|lustre]) ;; + user kernel|user|all]) ;; esac ZFS_AC_CONFIG_SCRIPT diff --git a/configure.ac b/configure.ac index 36979e0f70..51ec72c5fe 100644 --- a/configure.ac +++ b/configure.ac @@ -43,7 +43,7 @@ AC_PROG_INSTALL AC_PROG_CC AC_PROG_LIBTOOL -zfsconfig=kernel +zfsconfig=all kernelsrc= kernelbuild= splsrc= @@ -68,18 +68,6 @@ AC_CHECK_LIB([share], [sa_init], [AC_DEFINE([HAVE_LIBSHARE], 1, [Define to 1 if 'libshare' library available])]) -AC_EGREP_HEADER(ioctl, unistd.h, - [AC_DEFINE([HAVE_IOCTL_IN_UNISTD_H], 1, - [Define to 1 if ioctl() is defined in header file])]) - -AC_EGREP_HEADER(ioctl, sys/ioctl.h, - [AC_DEFINE([HAVE_IOCTL_IN_SYS_IOCTL_H], 1, - [Define to 1 if ioctl() is defined in header file])]) - -AC_EGREP_HEADER(ioctl, stropts.h, - [AC_DEFINE([HAVE_IOCTL_IN_STROPTS_H], 1, - [Define to 1 if ioctl() is defined in header file])]) - AC_EGREP_HEADER(strcmp, strings.h, [AC_DEFINE([HAVE_STRCMP_IN_STRINGS_H], 1, [Define to 1 if strcmpl() is defined in header file])]) diff --git a/scripts/create-zpool.sh b/scripts/create-zpool.sh index 197e1ef4cb..3728c1fa1f 100644 --- a/scripts/create-zpool.sh +++ b/scripts/create-zpool.sh @@ -27,13 +27,13 @@ prog=create-zpool.sh DEVICES="" echo -echo "zpool create lustre " -${CMDDIR}/zpool/zpool create -F lustre ${DEVICES} +echo "zpool create zpios " +${CMDDIR}/zpool/zpool create -F zpios ${DEVICES} echo echo "zpool list" ${CMDDIR}/zpool/zpool list echo -echo "zpool status lustre" -${CMDDIR}/zpool/zpool status lustre +echo "zpool status zpios" +${CMDDIR}/zpool/zpool status zpios