[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen master] tools: remove in tree libaio



commit 3d4678108a2157db6ae8c290897f67aaed14cdfa
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Wed Jul 31 16:15:51 2013 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Tue Aug 20 15:34:03 2013 +0100

    tools: remove in tree libaio
    
    We have defaulted to using the system libaio for a while now and I din't 
think
    there are any relevant distros which don't have it that running Xen 4.4 
would
    be reasonable on.
    
    Also it has caused confusion because it is not ever wanted on ARM, but the
    build system doesn't express that (could be fixed, but deleting is the right
    thing to do anyway).
    
    Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Matt Wilson <msw@xxxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 .gitignore                              |    2 -
 .hgignore                               |    2 -
 README                                  |    2 +-
 config/Tools.mk.in                      |    1 -
 tools/Makefile                          |    6 -
 tools/blktap/drivers/Makefile           |    6 -
 tools/blktap2/drivers/Makefile          |    7 -
 tools/config.h.in                       |    3 +
 tools/configure                         |    9 +-
 tools/configure.ac                      |    2 +-
 tools/libaio/COPYING                    |  515 -------------------------------
 tools/libaio/ChangeLog                  |   43 ---
 tools/libaio/INSTALL                    |   18 -
 tools/libaio/Makefile                   |   40 ---
 tools/libaio/TODO                       |    4 -
 tools/libaio/harness/Makefile           |   37 ---
 tools/libaio/harness/README             |   19 --
 tools/libaio/harness/attic/0.t          |    9 -
 tools/libaio/harness/attic/1.t          |    9 -
 tools/libaio/harness/cases/10.t         |   53 ----
 tools/libaio/harness/cases/11.t         |   39 ---
 tools/libaio/harness/cases/12.t         |   49 ---
 tools/libaio/harness/cases/13.t         |   66 ----
 tools/libaio/harness/cases/14.t         |   90 ------
 tools/libaio/harness/cases/2.t          |   41 ---
 tools/libaio/harness/cases/3.t          |   25 --
 tools/libaio/harness/cases/4.t          |   72 -----
 tools/libaio/harness/cases/5.t          |   47 ---
 tools/libaio/harness/cases/6.t          |   57 ----
 tools/libaio/harness/cases/7.t          |   27 --
 tools/libaio/harness/cases/8.t          |   49 ---
 tools/libaio/harness/cases/aio_setup.h  |   98 ------
 tools/libaio/harness/cases/common-7-8.h |   37 ---
 tools/libaio/harness/main.c             |   39 ---
 tools/libaio/harness/runtests.sh        |   19 --
 tools/libaio/libaio.spec                |  187 -----------
 tools/libaio/man/aio.3                  |  315 -------------------
 tools/libaio/man/aio_cancel.3           |  137 --------
 tools/libaio/man/aio_cancel64.3         |   50 ---
 tools/libaio/man/aio_error.3            |   81 -----
 tools/libaio/man/aio_error64.3          |   64 ----
 tools/libaio/man/aio_fsync.3            |  139 ---------
 tools/libaio/man/aio_fsync64.3          |   51 ---
 tools/libaio/man/aio_init.3             |   96 ------
 tools/libaio/man/aio_read.3             |  146 ---------
 tools/libaio/man/aio_read64.3           |   60 ----
 tools/libaio/man/aio_return.3           |   71 -----
 tools/libaio/man/aio_return64.3         |   51 ---
 tools/libaio/man/aio_suspend.3          |  123 --------
 tools/libaio/man/aio_suspend64.3        |   51 ---
 tools/libaio/man/aio_write.3            |  176 -----------
 tools/libaio/man/aio_write64.3          |   61 ----
 tools/libaio/man/io.3                   |  351 ---------------------
 tools/libaio/man/io_cancel.1            |   21 --
 tools/libaio/man/io_cancel.3            |   65 ----
 tools/libaio/man/io_destroy.1           |   17 -
 tools/libaio/man/io_fsync.3             |   82 -----
 tools/libaio/man/io_getevents.1         |   29 --
 tools/libaio/man/io_getevents.3         |   79 -----
 tools/libaio/man/io_prep_fsync.3        |   89 ------
 tools/libaio/man/io_prep_pread.3        |   79 -----
 tools/libaio/man/io_prep_pwrite.3       |   77 -----
 tools/libaio/man/io_queue_init.3        |   63 ----
 tools/libaio/man/io_queue_release.3     |   48 ---
 tools/libaio/man/io_queue_run.3         |   50 ---
 tools/libaio/man/io_queue_wait.3        |   56 ----
 tools/libaio/man/io_set_callback.3      |   44 ---
 tools/libaio/man/io_setup.1             |   15 -
 tools/libaio/man/io_submit.1            |  109 -------
 tools/libaio/man/io_submit.3            |  135 --------
 tools/libaio/man/lio_listio.3           |  229 --------------
 tools/libaio/man/lio_listio64.3         |   39 ---
 tools/libaio/src/Makefile               |   67 ----
 tools/libaio/src/compat-0_1.c           |   62 ----
 tools/libaio/src/io_cancel.c            |   23 --
 tools/libaio/src/io_destroy.c           |   23 --
 tools/libaio/src/io_getevents.c         |   57 ----
 tools/libaio/src/io_queue_init.c        |   33 --
 tools/libaio/src/io_queue_release.c     |   27 --
 tools/libaio/src/io_queue_run.c         |   39 ---
 tools/libaio/src/io_queue_wait.c        |   31 --
 tools/libaio/src/io_setup.c             |   23 --
 tools/libaio/src/io_submit.c            |   23 --
 tools/libaio/src/libaio.h               |  222 -------------
 tools/libaio/src/libaio.map             |   22 --
 tools/libaio/src/raw_syscall.c          |   19 --
 tools/libaio/src/syscall-alpha.h        |  209 -------------
 tools/libaio/src/syscall-i386.h         |   72 -----
 tools/libaio/src/syscall-ppc.h          |   98 ------
 tools/libaio/src/syscall-s390.h         |  131 --------
 tools/libaio/src/syscall-x86_64.h       |   63 ----
 tools/libaio/src/syscall.h              |   27 --
 tools/libaio/src/vsys_def.h             |   24 --
 93 files changed, 12 insertions(+), 6361 deletions(-)

diff --git a/.gitignore b/.gitignore
index 960c29e..62462b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -208,8 +208,6 @@ tools/libxl/testenum.c
 tools/libxl/tmp.*
 tools/libxl/_libxl.api-for-check
 tools/libxl/*.api-ok
-tools/libaio/src/*.ol
-tools/libaio/src/*.os
 tools/misc/cpuperf/cpuperf-perfcntr
 tools/misc/cpuperf/cpuperf-xen
 tools/misc/lomount/lomount
diff --git a/.hgignore b/.hgignore
index f3877a9..9822a8d 100644
--- a/.hgignore
+++ b/.hgignore
@@ -201,8 +201,6 @@
 ^tools/libxl/_libxl\.api-for-check
 ^tools/libxl/libxl\.api-ok
 ^tools/libvchan/vchan-node[12]$
-^tools/libaio/src/.*\.ol$
-^tools/libaio/src/.*\.os$
 ^tools/misc/cpuperf/cpuperf-perfcntr$
 ^tools/misc/cpuperf/cpuperf-xen$
 ^tools/misc/lomount/lomount$
diff --git a/README b/README
index 9f6c9f5..8689ce1 100644
--- a/README
+++ b/README
@@ -51,7 +51,7 @@ provided by your OS distributor:
     * Development install of uuid (e.g. uuid-dev)
     * Development install of yajl (e.g. libyajl-dev)
     * Development install of libaio (e.g. libaio-dev) version 0.3.107 or
-      greater. Set CONFIG_SYSTEM_LIBAIO in .config if this is not available.
+      greater.
     * Development install of GLib v2.0 (e.g. libglib2.0-dev)
     * Development install of Pixman (e.g. libpixman-1-dev)
     * pkg-config
diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index ef41c2a..bb3acbd 100644
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -55,7 +55,6 @@ CONFIG_SEABIOS      := @seabios@
 CONFIG_XEND         := @xend@
 
 #System options
-CONFIG_SYSTEM_LIBAIO:= @system_aio@
 ZLIB                := @zlib@
 CONFIG_LIBICONV     := @libiconv@
 CONFIG_GCRYPT       := @libgcrypt@
diff --git a/tools/Makefile b/tools/Makefile
index 6791829..553aa33 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,10 +1,6 @@
 XEN_ROOT = $(CURDIR)/..
 include $(XEN_ROOT)/tools/Rules.mk
 
-ifneq ($(CONFIG_SYSTEM_LIBAIO),y)
-SUBDIRS-libaio := libaio
-endif
-
 SUBDIRS-y :=
 SUBDIRS-y += include
 SUBDIRS-y += libxc
@@ -19,13 +15,11 @@ SUBDIRS-$(CONFIG_X86) += firmware
 SUBDIRS-y += console
 SUBDIRS-y += xenmon
 SUBDIRS-y += xenstat
-SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio)
 SUBDIRS-$(CONFIG_Linux) += memshr 
 ifeq ($(CONFIG_X86),y)
 SUBDIRS-$(CONFIG_Linux) += blktap
 endif
 SUBDIRS-$(CONFIG_Linux) += blktap2
-SUBDIRS-$(CONFIG_NetBSD) += $(SUBDIRS-libaio)
 SUBDIRS-$(CONFIG_NetBSD) += blktap2
 SUBDIRS-$(CONFIG_NetBSD) += xenbackendd
 SUBDIRS-y += libfsimage
diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile
index 941592e..7461a95 100644
--- a/tools/blktap/drivers/Makefile
+++ b/tools/blktap/drivers/Makefile
@@ -27,13 +27,7 @@ CFLAGS += -I $(MEMSHR_DIR)
 MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a
 endif
 
-ifneq ($(CONFIG_SYSTEM_LIBAIO),y)
-LIBAIO_DIR   = ../../libaio/src
-CFLAGS      += -I $(LIBAIO_DIR)
-AIOLIBS     := $(LIBAIO_DIR)/libaio.a
-else
 AIOLIBS     := -laio
-endif
 
 CFLAGS += $(PTHREAD_CFLAGS)
 LDFLAGS += $(PTHREAD_LDFLAGS)
diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile
index f47abb3..5c6ab6a 100644
--- a/tools/blktap2/drivers/Makefile
+++ b/tools/blktap2/drivers/Makefile
@@ -28,14 +28,7 @@ REMUS-OBJS  += hashtable.o
 REMUS-OBJS  += hashtable_itr.o
 REMUS-OBJS  += hashtable_utility.o
 
-ifneq ($(CONFIG_SYSTEM_LIBAIO),y)
-CFLAGS    += -I $(LIBAIO_DIR)
-LIBAIO_DIR = $(XEN_ROOT)/tools/libaio/src
-tapdisk2 tapdisk-stream tapdisk-diff $(QCOW_UTIL): AIOLIBS := 
$(LIBAIO_DIR)/libaio.a 
-tapdisk-client tapdisk-stream tapdisk-diff $(QCOW_UTIL): CFLAGS  += 
-I$(LIBAIO_DIR)
-else
 tapdisk2 tapdisk-stream tapdisk-diff $(QCOW_UTIL): AIOLIBS := -laio
-endif
 
 MEMSHRLIBS :=
 ifeq ($(CONFIG_Linux), __fixme__)
diff --git a/tools/config.h.in b/tools/config.h.in
index a67910b..8bda0bd 100644
--- a/tools/config.h.in
+++ b/tools/config.h.in
@@ -3,6 +3,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `aio' library (-laio). */
+#undef HAVE_LIBAIO
+
 /* Define to 1 if you have the `crypto' library (-lcrypto). */
 #undef HAVE_LIBCRYPTO
 
diff --git a/tools/configure b/tools/configure
index 6e2f758..b52dd2a 100755
--- a/tools/configure
+++ b/tools/configure
@@ -7375,9 +7375,14 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aio_io_setup" >&5
 $as_echo "$ac_cv_lib_aio_io_setup" >&6; }
 if test "x$ac_cv_lib_aio_io_setup" = x""yes; then :
-  system_aio="y"
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBAIO 1
+_ACEOF
+
+  LIBS="-laio $LIBS"
+
 else
-  system_aio="n"
+  as_fn_error $? "Could not find libaio" "$LINENO" 5
 fi
 
 
diff --git a/tools/configure.ac b/tools/configure.ac
index d6eba44..f629318 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -155,7 +155,7 @@ AC_CHECK_HEADER([lzo/lzo1x.h], [
 AC_CHECK_LIB([lzo2], [lzo1x_decompress], [zlib="$zlib -DHAVE_LZO1X -llzo2"])
 ])
 AC_SUBST(zlib)
-AC_CHECK_LIB([aio], [io_setup], [system_aio="y"], [system_aio="n"])
+AC_CHECK_LIB([aio], [io_setup], [], [AC_MSG_ERROR([Could not find libaio])])
 AC_SUBST(system_aio)
 AC_CHECK_LIB([crypto], [MD5], [], [AC_MSG_ERROR([Could not find libcrypto])])
 AX_CHECK_EXTFS
diff --git a/tools/libaio/COPYING b/tools/libaio/COPYING
deleted file mode 100644
index c4792dd..0000000
--- a/tools/libaio/COPYING
+++ /dev/null
@@ -1,515 +0,0 @@
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-^L
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-^L
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-^L
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-^L
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-^L
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-^L
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-^L
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-^L
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
-    <one line to give the library's name and a brief idea of what it
-does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-Also add information on how to contact you by electronic and paper
-mail.
-
-You should also get your employer (if you work as a programmer) or
-your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/tools/libaio/ChangeLog b/tools/libaio/ChangeLog
deleted file mode 100644
index ddcf6e3..0000000
--- a/tools/libaio/ChangeLog
+++ /dev/null
@@ -1,43 +0,0 @@
-0.4.0
-       - remove libredhat-kernel
-       - add rough outline for man pages
-       - make the compiled io_getevents() add the extra parameter and 
-         pass the timeout for updating as per 2.5
-       - fixes for ia64, now works
-       - fixes for x86-64
-       - powerpc support from Gianni Tedesco <gianni@xxxxxxxxxx>
-       - disable the NULL check in harness/cases/4.t on ia64: ia64 
-         maps the 0 page and causes this check to fail.
-
-0.3.15
-       - use real syscall interface, but don't break source compatibility 
-         yet (that will happen with 0.4.0)
-
-0.3.13
-       - add test cases
-
-0.3.11
-       - use library versioning of libredhat-kernel to always provide a 
-         fallback
-
-0.3.9
-       - add io_queue_release function
-
-0.3.8
-       - make clean deletes libredhat-kernel.so.1
-       - const struct timespec *
-       - add make srpm target
-
-0.3.7
-       - fix assembly function .types
-       - export io_getevents
-       - fix io_submit function prototype to match the kernel
-       - provide /usr/lib/libredhat-kernel.so link for compilation
-         (do NOT link against libredhat-kernel.so directly)
-       - fix soname to libaio.so.1
-       - fix dummy libredhat-kernel's soname
-       - work around nfs bug
-       - provide and install libredhat-kernel.so.1 stub
-       - Makefile improvements
-       - make sure dummy libredhat-kernel.so only returns -ENOSYS
-
diff --git a/tools/libaio/INSTALL b/tools/libaio/INSTALL
deleted file mode 100644
index 29b9077..0000000
--- a/tools/libaio/INSTALL
+++ /dev/null
@@ -1,18 +0,0 @@
-To install the library, execute the command:
-
-       make prefix=`pwd`/usr install
-
-which will install the binaries and header files into the directory 
-usr.  Set prefix=/usr to get them installed into the main system.
-
-Please note:  Do not attempt to install on the system the
-"libredhat-kernel.so" file.  It is a dummy shared library
-provided only for the purpose of being able to bootstrap
-this facility while running on systems without the correct
-libredhat-kernel.so built.  The contents of the included
-libredhat-kernel.so are only stubs; this library is NOT
-functional for anything except the internal purpose of
-linking libaio.so against the provided stubs.  At runtime,
-libaio.so requires a real libredhat-kernel.so library; this
-is provided by the Red Hat kernel RPM packages with async
-I/O functionality.
diff --git a/tools/libaio/Makefile b/tools/libaio/Makefile
deleted file mode 100644
index 7f5c344..0000000
--- a/tools/libaio/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-NAME=libaio
-SPECFILE=$(NAME).spec
-VERSION=$(shell awk '/Version:/ { print $$2 }' $(SPECFILE))
-RELEASE=$(shell awk '/Release:/ { print $$2 }' $(SPECFILE))
-CVSTAG = $(NAME)_$(subst .,-,$(VERSION))_$(subst .,-,$(RELEASE))
-RPMBUILD=$(shell `which rpmbuild >&/dev/null` && echo "rpmbuild" || echo "rpm")
-
-prefix=/usr
-includedir=$(prefix)/include
-libdir=$(prefix)/lib
-
-default: all
-
-all:
-       @$(MAKE) -C src
-
-install: all
-
-clean:
-       @$(MAKE) -C src clean
-       @$(MAKE) -C harness clean
-
-tag-archive:
-       @cvs -Q tag -F $(CVSTAG)
-
-create-archive: tag-archive
-       @rm -rf /tmp/$(NAME)
-       @cd /tmp && cvs -Q -d $(CVSROOT) export -r$(CVSTAG) $(NAME) || echo 
GRRRrrrrr -- ignore [export aborted]
-       @mv /tmp/$(NAME) /tmp/$(NAME)-$(VERSION)
-       @cd /tmp && tar czSpf $(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION)
-       @rm -rf /tmp/$(NAME)-$(VERSION)
-       @cp /tmp/$(NAME)-$(VERSION).tar.gz .
-       @rm -f /tmp/$(NAME)-$(VERSION).tar.gz 
-       @echo " "
-       @echo "The final archive is ./$(NAME)-$(VERSION).tar.gz."
-
-archive: clean tag-archive create-archive
-
-srpm: create-archive
-       $(RPMBUILD) --define "_sourcedir `pwd`" --define "_srcrpmdir `pwd`" 
--nodeps -bs $(SPECFILE)
diff --git a/tools/libaio/TODO b/tools/libaio/TODO
deleted file mode 100644
index 0a9ac15..0000000
--- a/tools/libaio/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-- Write man pages.
-- Make -static links against libaio work.
-- Fallback on userspace if the kernel calls return -ENOSYS.
-
diff --git a/tools/libaio/harness/Makefile b/tools/libaio/harness/Makefile
deleted file mode 100644
index d2483fd..0000000
--- a/tools/libaio/harness/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# foo.
-TEST_SRCS:=$(shell find cases/ -name \*.t | sort -n -t/ -k2)
-PROGS:=$(patsubst %.t,%.p,$(TEST_SRCS))
-HARNESS_SRCS:=main.c
-# io_queue.c
-
-CFLAGS=-Wall -Werror -g -O -laio
-#-lpthread -lrt
-
-all: $(PROGS)
-
-$(PROGS): %.p: %.t $(HARNESS_SRCS)
-       $(CC) $(CFLAGS) -DTEST_NAME=\"$<\" -o $@ main.c
-
-clean:
-       rm -f $(PROGS) *.o runtests.out rofile wofile rwfile
-
-.PHONY:
-
-testdir/rofile: .PHONY
-       rm -f $@
-       echo "test" >$@
-       chmod 400 $@
-
-testdir/wofile: .PHONY
-       rm -f $@
-       echo "test" >$@
-       chmod 200 $@
-
-testdir/rwfile: .PHONY
-       rm -f $@
-       echo "test" >$@
-       chmod 600 $@
-
-check: $(PROGS) testdir/rofile testdir/rwfile testdir/wofile
-       ./runtests.sh $(PROGS)
-
diff --git a/tools/libaio/harness/README b/tools/libaio/harness/README
deleted file mode 100644
index 5557370..0000000
--- a/tools/libaio/harness/README
+++ /dev/null
@@ -1,19 +0,0 @@
-Notes on running this test suite:
-
-To run the test suite, run "make check".  All test cases should pass 
-and there should be 0 fails.
-
-Several of the test cases require a directory on the filesystem under 
-test for the creation of test files, as well as the generation of 
-error conditions.  The test cases assume the directories (or symlinks 
-to directories) are as follows:
-
-       testdir/
-               - used for general read/write test cases.  Must have at 
-                 least as much free space as the machine has RAM (up 
-                 to 768MB).
-       testdir.enospc/
-               - a filesystem that has space for writing 8KB out, but 
-                 fails with -ENOSPC beyond 8KB.
-       testdir.ext2/
-               - must be an ext2 filesystem.
diff --git a/tools/libaio/harness/attic/0.t b/tools/libaio/harness/attic/0.t
deleted file mode 100644
index 033e62c..0000000
--- a/tools/libaio/harness/attic/0.t
+++ /dev/null
@@ -1,9 +0,0 @@
-/* 0.t
-       Test harness check: okay.
-*/
-int test_main(void)
-{
-       printf("test_main: okay\n");
-       return 0;
-}
-
diff --git a/tools/libaio/harness/attic/1.t b/tools/libaio/harness/attic/1.t
deleted file mode 100644
index 799ffd1..0000000
--- a/tools/libaio/harness/attic/1.t
+++ /dev/null
@@ -1,9 +0,0 @@
-/* 1.t
-       Test harness check: fail.
-*/
-int test_main(void)
-{
-       printf("test_main: fail\n");
-       return 1;
-}
-
diff --git a/tools/libaio/harness/cases/10.t b/tools/libaio/harness/cases/10.t
deleted file mode 100644
index 9d3beb2..0000000
--- a/tools/libaio/harness/cases/10.t
+++ /dev/null
@@ -1,53 +0,0 @@
-/* 10.t - uses testdir.enospc/rwfile
-- Check results on out-of-space and out-of-quota. (10.t)
-        - write that fills filesystem but does not go over should succeed
-        - write that fills filesystem and goes over should be partial
-        - write to full filesystem should return -ENOSPC
-        - read beyond end of file after ENOSPC should return 0
-*/
-#include "aio_setup.h"
-
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <unistd.h>
-
-int test_main(void)
-{
-/* Note: changing either of these requires updating the ext2-enospc.img
- * filesystem image.  Also, if SIZE is less than PAGE_SIZE, problems 
- * crop up due to ext2's preallocation.
- */
-#define LIMIT  65536
-#define SIZE   65536
-       char *buf;
-       int rwfd;
-       int status = 0, res;
-
-       rwfd = open("testdir.enospc/rwfile", O_RDWR|O_CREAT|O_TRUNC, 0600);
-                                                       assert(rwfd != -1);
-       res = ftruncate(rwfd, 0);                       assert(res == 0);
-       buf = malloc(SIZE);                             assert(buf != NULL);
-       memset(buf, 0, SIZE);
-
-
-       status |= attempt_rw(rwfd, buf, SIZE,   LIMIT-SIZE, WRITE, SIZE);
-       status |= attempt_rw(rwfd, buf, SIZE,   LIMIT-SIZE,  READ, SIZE);
-
-       status |= attempt_rw(rwfd, buf, SIZE,        LIMIT, WRITE, -ENOSPC);
-       status |= attempt_rw(rwfd, buf, SIZE,        LIMIT,  READ,       0);
-
-       res = ftruncate(rwfd, 0);                       assert(res == 0);
-
-       status |= attempt_rw(rwfd, buf, SIZE, 1+LIMIT-SIZE, WRITE, SIZE-1);
-       status |= attempt_rw(rwfd, buf, SIZE, 1+LIMIT-SIZE,  READ, SIZE-1);
-       status |= attempt_rw(rwfd, buf, SIZE,        LIMIT,  READ,      0);
-
-       status |= attempt_rw(rwfd, buf, SIZE,        LIMIT, WRITE, -ENOSPC);
-       status |= attempt_rw(rwfd, buf, SIZE,        LIMIT,  READ,       0);
-       status |= attempt_rw(rwfd, buf,    0,        LIMIT, WRITE,       0);
-
-       res = close(rwfd);                              assert(res == 0);
-       res = unlink("testdir.enospc/rwfile");          assert(res == 0);
-       return status;
-}
-
diff --git a/tools/libaio/harness/cases/11.t b/tools/libaio/harness/cases/11.t
deleted file mode 100644
index efcf6d4..0000000
--- a/tools/libaio/harness/cases/11.t
+++ /dev/null
@@ -1,39 +0,0 @@
-/* 11.t - uses testdir/rwfile
-- repeated read / write of same page (to check accounting) (11.t)
-*/
-#include "aio_setup.h"
-
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <unistd.h>
-
-int test_main(void)
-{
-#define COUNT  1000000
-#define SIZE   256
-       char *buf;
-       int rwfd;
-       int status = 0;
-       int i;
-
-       rwfd = open("testdir/rwfile", O_RDWR|O_CREAT|O_TRUNC, 0600);
-                                                       assert(rwfd != -1);
-       buf = malloc(SIZE);                             assert(buf != NULL);
-       memset(buf, 0, SIZE);
-
-       for (i=0; i<COUNT; i++) {
-               status |= attempt_rw(rwfd, buf, SIZE, 0, WRITE_SILENT, SIZE);
-               if (status)
-                       break;
-       }
-       printf("completed %d out of %d writes\n", i, COUNT);
-       for (i=0; i<COUNT; i++) {
-               status |= attempt_rw(rwfd, buf, SIZE, 0, READ_SILENT, SIZE);
-               if (status)
-                       break;
-       }
-       printf("completed %d out of %d reads\n", i, COUNT);
-
-       return status;
-}
-
diff --git a/tools/libaio/harness/cases/12.t b/tools/libaio/harness/cases/12.t
deleted file mode 100644
index 3499204..0000000
--- a/tools/libaio/harness/cases/12.t
+++ /dev/null
@@ -1,49 +0,0 @@
-/* 12.t
-- ioctx access across fork() (12.t)
- */
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <signal.h>
-
-#include "aio_setup.h"
-
-void test_child(void)
-{
-       int res;
-       res = attempt_io_submit(io_ctx, 0, NULL, -EINVAL);
-       fflush(stdout);
-       _exit(res);
-}
-
-int test_main(void)
-{
-       int res, status;
-       pid_t pid;
-
-       if (attempt_io_submit(io_ctx, 0, NULL, 0))
-               return 1;
-
-       sigblock(sigmask(SIGCHLD) | siggetmask());
-       fflush(NULL);
-       pid = fork();                           assert(pid != -1);
-
-       if (pid == 0)
-               test_child();
-
-       res = waitpid(pid, &status, 0);
-
-       if (WIFEXITED(status)) {
-               int failed = (WEXITSTATUS(status) != 0);
-               printf("child exited with status %d%s\n", WEXITSTATUS(status),
-                       failed ? " -- FAILED" : "");
-               return failed;
-       }
-
-       /* anything else: failed */
-       if (WIFSIGNALED(status))
-               printf("child killed by signal %d -- FAILED.\n",
-                       WTERMSIG(status));
-
-       return 1;
-}
diff --git a/tools/libaio/harness/cases/13.t b/tools/libaio/harness/cases/13.t
deleted file mode 100644
index 5f18005..0000000
--- a/tools/libaio/harness/cases/13.t
+++ /dev/null
@@ -1,66 +0,0 @@
-/* 13.t - uses testdir/rwfile
-- Submit multiple writes larger than aio-max-size (deadlocks on older
-  aio code)
-*/
-#include "aio_setup.h"
-
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <unistd.h>
-
-int test_main(void)
-{
-#define SIZE   (1024 * 1024)
-#define IOS    8
-       struct iocb     iocbs[IOS];
-       struct iocb     *iocb_list[IOS];
-       char *bufs[IOS];
-       int rwfd;
-       int status = 0, res;
-       int i;
-
-       rwfd = open("testdir/rwfile", O_RDWR|O_CREAT|O_TRUNC, 0600);
-                                                       assert(rwfd != -1);
-       res = ftruncate(rwfd, 0);                       assert(res == 0);
-
-       for (i=0; i<IOS; i++) {
-               bufs[i] = malloc(SIZE);
-               assert(bufs[i] != NULL);
-               memset(bufs[i], 0, SIZE);
-
-               io_prep_pwrite(&iocbs[i], rwfd, bufs[i], SIZE, i * SIZE);
-               iocb_list[i] = &iocbs[i];
-       }
-
-       status |= attempt_io_submit(io_ctx, IOS, iocb_list, IOS);
-
-       for (i=0; i<IOS; i++) {
-               struct timespec ts = { tv_sec: 30, tv_nsec: 0 };
-               struct io_event event;
-               struct iocb *iocb;
-
-               res = io_getevents(io_ctx, 0, 1, &event, &ts);
-               if (res != 1) {
-                       status |= 1;
-                       printf("io_getevents failed [%d] with res=%d [%s]\n",
-                               i, res, (res < 0) ? strerror(-res) : "okay");
-                       break;
-               }
-
-               if (event.res != SIZE)
-                       status |= 1;
-
-               iocb = (void *)event.obj;
-               printf("event[%d]: write[%d] %s, returned: %ld [%s]\n",
-                       i, (int)(iocb - &iocbs[0]),
-                       (event.res != SIZE) ? "failed" : "okay",
-                       (long)event.res,
-                       (event.res < 0) ? strerror(-event.res) : "okay"
-                       );
-       }
-
-       res = ftruncate(rwfd, 0);                       assert(res == 0);
-       res = close(rwfd);                              assert(res == 0);
-       return status;
-}
-
diff --git a/tools/libaio/harness/cases/14.t b/tools/libaio/harness/cases/14.t
deleted file mode 100644
index 514622b..0000000
--- a/tools/libaio/harness/cases/14.t
+++ /dev/null
@@ -1,90 +0,0 @@
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <signal.h>
-
-#include "aio_setup.h"
-#include <sys/mman.h>
-
-#define SIZE 768*1024*1024
-
-//just submit an I/O
-
-int test_child(void)
-{
-        char *buf;
-        int rwfd;
-        int res;
-        long size;
-        struct iocb iocb;
-        struct iocb *iocbs[] = { &iocb };
-        int loop = 10;
-        int i;
-
-       aio_setup(1024);
-
-        size = SIZE;
-
-        printf("size = %ld\n", size);
-
-        rwfd = open("testdir/rwfile", O_RDWR);          assert(rwfd != 
--1);
-        res = ftruncate(rwfd, 0);                       assert(res == 0);
-        buf = malloc(size);                             assert(buf != 
-NULL);
-
-        for(i=0;i<loop;i++) {
-
-                switch(i%2) {
-                case 0:
-                        io_prep_pwrite(&iocb, rwfd, buf, size, 0);
-                        break;
-                case 1:
-                        io_prep_pread(&iocb, rwfd, buf, size, 0);
-                }
-
-                res = io_submit(io_ctx, 1, iocbs);
-                if (res != 1) {
-                        printf("child: submit: io_submit res=%d [%s]\n", res, 
-strerror(-res));
-                        _exit(1);
-                }
-        }
-
-        res = ftruncate(rwfd, 0);                       assert(res == 0);
-
-        _exit(0);
-}
-
-/* from 12.t */
-int test_main(void)
-{
-       int res, status;
-       pid_t pid;
-
-       if (attempt_io_submit(io_ctx, 0, NULL, 0))
-               return 1;
-
-       sigblock(sigmask(SIGCHLD) | siggetmask());
-       fflush(NULL);
-       pid = fork();                           assert(pid != -1);
-
-       if (pid == 0)
-               test_child();
-
-       res = waitpid(pid, &status, 0);
-
-       if (WIFEXITED(status)) {
-               int failed = (WEXITSTATUS(status) != 0);
-               printf("child exited with status %d%s\n", WEXITSTATUS(status),
-                       failed ? " -- FAILED" : "");
-               return failed;
-       }
-
-       /* anything else: failed */
-       if (WIFSIGNALED(status))
-               printf("child killed by signal %d -- FAILED.\n",
-                       WTERMSIG(status));
-
-       return 1;
-}
diff --git a/tools/libaio/harness/cases/2.t b/tools/libaio/harness/cases/2.t
deleted file mode 100644
index 3a0212d..0000000
--- a/tools/libaio/harness/cases/2.t
+++ /dev/null
@@ -1,41 +0,0 @@
-/* 2.t
-- io_setup (#2)
-        - with invalid context pointer
-        - with maxevents <= 0
-        - with an already initialized ctxp
-*/
-
-int attempt(int n, io_context_t *ctxp, int expect)
-{
-       int res;
-
-       printf("expect %3d: io_setup(%5d, %p) = ", expect, n, ctxp);
-       fflush(stdout);
-       res = io_setup(n, ctxp);
-       printf("%3d [%s]%s\n", res, strerror(-res), 
-               (res != expect) ? " -- FAILED" : "");
-       if (res != expect)
-               return 1;
-
-       return 0;
-}
-
-int test_main(void)
-{
-       io_context_t    ctx;
-       int     status = 0;
-
-       ctx = NULL;
-       status |= attempt(-1000, KERNEL_RW_POINTER, -EFAULT);
-       status |= attempt( 1000, KERNEL_RW_POINTER, -EFAULT);
-       status |= attempt(    0, KERNEL_RW_POINTER, -EFAULT);
-       status |= attempt(-1000, &ctx, -EINVAL);
-       status |= attempt(   -1, &ctx, -EINVAL);
-       status |= attempt(    0, &ctx, -EINVAL);
-       assert(ctx == NULL);
-       status |= attempt(    1, &ctx, 0);
-       status |= attempt(    1, &ctx, -EINVAL);
-
-       return status;
-}
-
diff --git a/tools/libaio/harness/cases/3.t b/tools/libaio/harness/cases/3.t
deleted file mode 100644
index 7773d80..0000000
--- a/tools/libaio/harness/cases/3.t
+++ /dev/null
@@ -1,25 +0,0 @@
-/* 3.t
-- io_submit/io_getevents with invalid addresses (3.t)
-
-*/
-#include "aio_setup.h"
-
-int test_main(void)
-{
-       struct iocb a, b;
-       struct iocb *good_ios[] = { &a, &b };
-       struct iocb *bad1_ios[] = { NULL, &b };
-       struct iocb *bad2_ios[] = { KERNEL_RW_POINTER, &a };
-       int     status = 0;
-
-       status |= attempt_io_submit(BAD_CTX, 1,   good_ios, -EINVAL);
-       status |= attempt_io_submit( io_ctx, 0,   good_ios,       0);
-       status |= attempt_io_submit( io_ctx, 1,       NULL, -EFAULT);
-       status |= attempt_io_submit( io_ctx, 1, (void *)-1, -EFAULT);
-       status |= attempt_io_submit( io_ctx, 2,   bad1_ios, -EFAULT);
-       status |= attempt_io_submit( io_ctx, 2,   bad2_ios, -EFAULT);
-       status |= attempt_io_submit( io_ctx, -1,  good_ios, -EINVAL);
-
-       return status;
-}
-
diff --git a/tools/libaio/harness/cases/4.t b/tools/libaio/harness/cases/4.t
deleted file mode 100644
index 972b4f2..0000000
--- a/tools/libaio/harness/cases/4.t
+++ /dev/null
@@ -1,72 +0,0 @@
-/* 4.t
-- read of descriptor without read permission (4.t)
-- write to descriptor without write permission (4.t)
-- check that O_APPEND writes actually append
-
-*/
-#include "aio_setup.h"
-
-#define SIZE   512
-#define READ   'r'
-#define WRITE  'w'
-int attempt(int fd, void *buf, int count, long long pos, int rw, int expect)
-{
-       struct iocb iocb;
-       int res;
-
-       switch(rw) {
-       case READ:      io_prep_pread (&iocb, fd, buf, count, pos); break;
-       case WRITE:     io_prep_pwrite(&iocb, fd, buf, count, pos); break;
-       }
-
-       printf("expect %3d: (%c), res = ", expect, rw);
-       fflush(stdout);
-       res = sync_submit(&iocb);
-       printf("%3d [%s]%s\n", res, (res <= 0) ? strerror(-res) : "Success",
-               (res != expect) ? " -- FAILED" : "");
-       if (res != expect)
-               return 1;
-
-       return 0;
-}
-
-int test_main(void)
-{
-       char buf[SIZE];
-       int rofd, wofd, rwfd;
-       int     status = 0, res;
-
-       memset(buf, 0, SIZE);
-
-       rofd = open("testdir/rofile", O_RDONLY);        assert(rofd != -1);
-       wofd = open("testdir/wofile", O_WRONLY);        assert(wofd != -1);
-       rwfd = open("testdir/rwfile", O_RDWR);          assert(rwfd != -1);
-
-       status |= attempt(rofd, buf, SIZE,  0, WRITE, -EBADF);
-       status |= attempt(wofd, buf, SIZE,  0,  READ, -EBADF);
-       status |= attempt(rwfd, buf, SIZE,  0, WRITE, SIZE);
-       status |= attempt(rwfd, buf, SIZE,  0,  READ, SIZE);
-       status |= attempt(rwfd, buf, SIZE, -1,  READ, -EINVAL);
-       status |= attempt(rwfd, buf, SIZE, -1, WRITE, -EINVAL);
-
-       rwfd = open("testdir/rwfile", O_RDWR|O_APPEND); assert(rwfd != -1);
-       res = ftruncate(rwfd, 0);                       assert(res == 0);
-       status |= attempt(rwfd, buf,    SIZE, 0,  READ, 0);
-       status |= attempt(rwfd, "1234",    4, 0, WRITE, 4);
-       status |= attempt(rwfd, "5678",    4, 0, WRITE, 4);
-       memset(buf, 0, SIZE);
-       status |= attempt(rwfd,    buf, SIZE, 0,  READ, 8);
-       printf("read after append: [%s]\n", buf);
-       assert(memcmp(buf, "12345678", 8) == 0);
-
-       status |= attempt(rwfd, KERNEL_RW_POINTER, SIZE, 0,  READ, -EFAULT);
-       status |= attempt(rwfd, KERNEL_RW_POINTER, SIZE, 0, WRITE, -EFAULT);
-
-       /* Some architectures map the 0 page.  Ugh. */
-#if !defined(__ia64__)
-       status |= attempt(rwfd,              NULL, SIZE, 0, WRITE, -EFAULT);
-#endif
-
-       return status;
-}
-
diff --git a/tools/libaio/harness/cases/5.t b/tools/libaio/harness/cases/5.t
deleted file mode 100644
index 7669fd7..0000000
--- a/tools/libaio/harness/cases/5.t
+++ /dev/null
@@ -1,47 +0,0 @@
-/* 5.t
-- Write from a mmap() of the same file. (5.t)
-*/
-#include "aio_setup.h"
-#include <sys/mman.h>
-
-int test_main(void)
-{
-       int page_size = getpagesize();
-#define SIZE   512
-       char *buf;
-       int rwfd;
-       int     status = 0, res;
-
-       rwfd = open("testdir/rwfile", O_RDWR);          assert(rwfd != -1);
-       res = ftruncate(rwfd, 512);                     assert(res == 0);
-
-       buf = mmap(0, page_size, PROT_READ|PROT_WRITE, MAP_SHARED, rwfd, 0);
-       assert(buf != (char *)-1);
-
-       status |= attempt_rw(rwfd, buf, SIZE,  0, WRITE, SIZE);
-       status |= attempt_rw(rwfd, buf, SIZE,  0,  READ, SIZE);
-
-       res = munmap(buf, page_size);                   assert(res == 0);
-       buf = mmap(0, page_size, PROT_READ|PROT_WRITE, MAP_SHARED, rwfd, 0);
-       assert(buf != (char *)-1);
-
-       status |= attempt_rw(rwfd, buf, SIZE,  0,  READ, SIZE);
-       status |= attempt_rw(rwfd, buf, SIZE,  0, WRITE, SIZE);
-
-       res = munmap(buf, page_size);                   assert(res == 0);
-       buf = mmap(0, page_size, PROT_READ, MAP_SHARED, rwfd, 0);
-       assert(buf != (char *)-1);
-
-       status |= attempt_rw(rwfd, buf, SIZE,  0, WRITE, SIZE);
-       status |= attempt_rw(rwfd, buf, SIZE,  0,  READ, -EFAULT);
-
-       res = munmap(buf, page_size);                   assert(res == 0);
-       buf = mmap(0, page_size, PROT_WRITE, MAP_SHARED, rwfd, 0);
-       assert(buf != (char *)-1);
-
-       status |= attempt_rw(rwfd, buf, SIZE,  0,  READ, SIZE);
-       status |= attempt_rw(rwfd, buf, SIZE,  0, WRITE, -EFAULT);
-
-       return status;
-}
-
diff --git a/tools/libaio/harness/cases/6.t b/tools/libaio/harness/cases/6.t
deleted file mode 100644
index cea4b01..0000000
--- a/tools/libaio/harness/cases/6.t
+++ /dev/null
@@ -1,57 +0,0 @@
-/* 6.t
-- huge reads (pinned pages) (6.t)
-- huge writes (6.t)
-*/
-#include "aio_setup.h"
-#include <sys/mman.h>
-
-long getmemsize(void)
-{
-       FILE *f = fopen("/proc/meminfo", "r");
-       long size;
-       int gotit = 0;
-       char str[256];
-
-       assert(f != NULL);
-       while (NULL != fgets(str, 255, f)) {
-               str[255] = 0;
-               if (0 == memcmp(str, "MemTotal:", 9)) {
-                       if (1 == sscanf(str + 9, "%ld", &size)) {
-                               gotit = 1;
-                               break;
-                       }
-               }
-       }
-       fclose(f);
-
-       assert(gotit != 0);
-       return size;
-}
-
-int test_main(void)
-{
-       char *buf;
-       int rwfd;
-       int status = 0, res;
-       long size;
-
-       size = getmemsize();
-       printf("size = %ld\n", size);
-       assert(size >= (16 * 1024));
-       if (size > (768 * 1024))
-               size = 768 * 1024;
-       size *= 1024;
-
-       rwfd = open("testdir/rwfile", O_RDWR);          assert(rwfd != -1);
-       res = ftruncate(rwfd, 0);                       assert(res == 0);
-       buf = malloc(size);                             assert(buf != NULL);
-
-       //memset(buf, 0, size);
-       status |= attempt_rw(rwfd, buf, size,  0, WRITE, size);
-       status |= attempt_rw(rwfd, buf, size,  0,  READ, size);
-
-       //res = ftruncate(rwfd, 0);                     assert(res == 0);
-
-       return status;
-}
-
diff --git a/tools/libaio/harness/cases/7.t b/tools/libaio/harness/cases/7.t
deleted file mode 100644
index d2d6cbc..0000000
--- a/tools/libaio/harness/cases/7.t
+++ /dev/null
@@ -1,27 +0,0 @@
-/* 7.t
-- Write overlapping the file size rlimit boundary: should be a short
-  write. (7.t)
-- Write at the file size rlimit boundary: should give EFBIG.  (I think
-  the spec requires that you do NOT deliver SIGXFSZ in this case, where
-  you would do so for sync IO.) (7.t)
-- Special case: a write of zero bytes at or beyond the file size rlimit
-  boundary must return success. (7.t)
-*/
-
-#include <sys/resource.h>
-
-void SET_RLIMIT(long long limit)
-{
-       struct rlimit rlim;
-       int res;
-
-       rlim.rlim_cur = limit;                  assert(rlim.rlim_cur == limit);
-       rlim.rlim_max = limit;                  assert(rlim.rlim_max == limit);
-
-       res = setrlimit(RLIMIT_FSIZE, &rlim);   assert(res == 0);
-}
-
-#define LIMIT  8192
-#define FILENAME       "testdir/rwfile"
-
-#include "common-7-8.h"
diff --git a/tools/libaio/harness/cases/8.t b/tools/libaio/harness/cases/8.t
deleted file mode 100644
index 8a3d83e..0000000
--- a/tools/libaio/harness/cases/8.t
+++ /dev/null
@@ -1,49 +0,0 @@
-/* 8.t
-- Ditto for the above three tests at the offset maximum (largest
-  possible ext2/3 file size.) (8.t)
- */
-#include <sys/vfs.h>
-
-#define EXT2_OLD_SUPER_MAGIC   0xEF51
-#define EXT2_SUPER_MAGIC       0xEF53
-
-long long get_fs_limit(int fd)
-{
-       struct statfs s;
-       int res;
-       long long lim = 0;
-
-       res = fstatfs(fd, &s);          assert(res == 0);
-
-       switch(s.f_type) {
-       case EXT2_OLD_SUPER_MAGIC:
-       case EXT2_SUPER_MAGIC:
-#if 0
-       {
-               long long tmp;
-               tmp = s.f_bsize / 4;
-               /* 12 direct + indirect block + dind + tind */
-               lim = 12 + tmp + tmp * tmp + tmp * tmp * tmp;
-               lim *= s.f_bsize;
-               printf("limit(%ld) = %Ld\n", (long)s.f_bsize, lim);
-       }
-#endif
-               switch(s.f_bsize) {
-               case 4096: lim = 2199023251456; break;
-               default:
-                       printf("unknown ext2 blocksize %ld\n", (long)s.f_bsize);
-                       exit(3);
-               }
-               break;
-       default:
-               printf("unknown filesystem 0x%08lx\n", (long)s.f_type);
-               exit(3);
-       }
-       return lim;
-}
-
-#define SET_RLIMIT(x)  do ; while (0)
-#define LIMIT          get_fs_limit(rwfd)
-#define FILENAME       "testdir.ext2/rwfile"
-
-#include "common-7-8.h"
diff --git a/tools/libaio/harness/cases/aio_setup.h 
b/tools/libaio/harness/cases/aio_setup.h
deleted file mode 100644
index 37c9618..0000000
--- a/tools/libaio/harness/cases/aio_setup.h
+++ /dev/null
@@ -1,98 +0,0 @@
-io_context_t   io_ctx;
-#define BAD_CTX        ((io_context_t)-1)
-
-void aio_setup(int n)
-{
-       int res = io_queue_init(n, &io_ctx);
-       if (res != 0) {
-               printf("io_queue_setup(%d) returned %d (%s)\n",
-                       n, res, strerror(-res));
-               exit(3);
-       }
-}
-
-int attempt_io_submit(io_context_t ctx, long nr, struct iocb *ios[], int 
expect)
-{
-       int res;
-
-       printf("expect %3d: io_submit(%10p, %3ld, %10p) = ", expect, ctx, nr, 
ios);
-       fflush(stdout);
-       res = io_submit(ctx, nr, ios);
-       printf("%3d [%s]%s\n", res, (res <= 0) ? strerror(-res) : "",
-               (res != expect) ? " -- FAILED" : "");
-       if (res != expect)
-               return 1;
-
-       return 0;
-}
-
-int sync_submit(struct iocb *iocb)
-{
-       struct io_event event;
-       struct iocb *iocbs[] = { iocb };
-       int res;
-
-       /* 30 second timeout should be enough */
-       struct timespec ts;
-       ts.tv_sec = 30;
-       ts.tv_nsec = 0;
-
-       res = io_submit(io_ctx, 1, iocbs);
-       if (res != 1) {
-               printf("sync_submit: io_submit res=%d [%s]\n", res, 
strerror(-res));
-               return res;
-       }
-
-       res = io_getevents(io_ctx, 0, 1, &event, &ts);
-       if (res != 1) {
-               printf("sync_submit: io_getevents res=%d [%s]\n", res, 
strerror(-res));
-               return res;
-       }
-       return event.res;
-}
-
-#define SETUP  aio_setup(1024)
-
-
-#define READ           'r'
-#define WRITE          'w'
-#define READ_SILENT    'R'
-#define WRITE_SILENT   'W'
-int attempt_rw(int fd, void *buf, int count, long long pos, int rw, int expect)
-{
-       struct iocb iocb;
-       int res;
-       int silent = 0;
-
-       switch(rw) {
-       case READ_SILENT:
-               silent = 1;
-       case READ:
-               io_prep_pread (&iocb, fd, buf, count, pos);
-               break;
-       case WRITE_SILENT:
-               silent = 1;
-       case WRITE:
-               io_prep_pwrite(&iocb, fd, buf, count, pos);
-               break;
-       }
-
-       if (!silent) {
-               printf("expect %5d: (%c), res = ", expect, rw);
-               fflush(stdout);
-       }
-       res = sync_submit(&iocb);
-       if (!silent || res != expect) {
-               if (silent)
-                       printf("expect %5d: (%c), res = ", expect, rw);
-               printf("%5d [%s]%s\n", res,
-                       (res <= 0) ? strerror(-res) : "Success",
-                       (res != expect) ? " -- FAILED" : "");
-       }
-
-       if (res != expect)
-               return 1;
-
-       return 0;
-}
-
diff --git a/tools/libaio/harness/cases/common-7-8.h 
b/tools/libaio/harness/cases/common-7-8.h
deleted file mode 100644
index 3ec2bb4..0000000
--- a/tools/libaio/harness/cases/common-7-8.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* common-7-8.h
-*/
-#include "aio_setup.h"
-
-#include <unistd.h>
-
-#define SIZE   512
-
-int test_main(void)
-{
-       char *buf;
-       int rwfd;
-       int status = 0, res;
-       long long limit;
-
-       rwfd = open(FILENAME, O_RDWR);          assert(rwfd != -1);
-       res = ftruncate(rwfd, 0);                       assert(res == 0);
-       buf = malloc(SIZE);                             assert(buf != NULL);
-       memset(buf, 0, SIZE);
-
-       limit = LIMIT;
-
-       SET_RLIMIT(limit);
-
-       status |= attempt_rw(rwfd, buf, SIZE,   limit-SIZE, WRITE, SIZE);
-       status |= attempt_rw(rwfd, buf, SIZE,   limit-SIZE,  READ, SIZE);
-
-       status |= attempt_rw(rwfd, buf, SIZE, 1+limit-SIZE, WRITE, SIZE-1);
-       status |= attempt_rw(rwfd, buf, SIZE, 1+limit-SIZE,  READ, SIZE-1);
-
-       status |= attempt_rw(rwfd, buf, SIZE,        limit, WRITE, -EFBIG);
-       status |= attempt_rw(rwfd, buf, SIZE,        limit,  READ,      0);
-       status |= attempt_rw(rwfd, buf,    0,        limit, WRITE,      0);
-
-       return status;
-}
-
diff --git a/tools/libaio/harness/main.c b/tools/libaio/harness/main.c
deleted file mode 100644
index 74b2764..0000000
--- a/tools/libaio/harness/main.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <stdio.h>
-#include <errno.h>
-#include <assert.h>
-#include <stdlib.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include <libaio.h>
-
-#if defined(__i386__)
-#define KERNEL_RW_POINTER      ((void *)0xc0010000)
-#else
-//#warning Not really sure where kernel memory is.  Guessing.
-#define KERNEL_RW_POINTER      ((void *)0xffffffffc0010000)
-#endif
-
-
-char test_name[] = TEST_NAME;
-
-#include TEST_NAME
-
-int main(void)
-{
-       int res;
-
-#if defined(SETUP)
-       SETUP;
-#endif
-
-       res = test_main();
-       printf("test %s completed %s.\n", test_name, 
-               res ? "FAILED" : "PASSED"
-               );
-       fflush(stdout);
-       return res ? 1 : 0;
-}
diff --git a/tools/libaio/harness/runtests.sh b/tools/libaio/harness/runtests.sh
deleted file mode 100644
index d763d88..0000000
--- a/tools/libaio/harness/runtests.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-passes=0
-fails=0
-
-echo "Test run starting at" `date`
-
-while [ $# -ge 1 ] ; do
-       this_test=$1
-       shift
-       echo "Starting $this_test"
-       $this_test 2>&1
-       res=$?
-       if [ $res -eq 0 ] ; then str="" ; passes=$[passes + 1] ; else str=" -- 
FAILED" ; fails=$[fails + 1] ; fi
-       echo "Completed $this_test with $res$str".
-done
-
-echo "Pass: $passes  Fail: $fails"
-echo "Test run complete at" `date`
diff --git a/tools/libaio/libaio.spec b/tools/libaio/libaio.spec
deleted file mode 100644
index bdcc5b2..0000000
--- a/tools/libaio/libaio.spec
+++ /dev/null
@@ -1,187 +0,0 @@
-Name: libaio
-Version: 0.3.106
-Release: 1
-Summary: Linux-native asynchronous I/O access library
-Copyright: LGPL
-Group:  System Environment/Libraries
-Source: %{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-root
-# Fix ExclusiveArch as we implement this functionality on more architectures
-ExclusiveArch: i386 x86_64 ia64 s390 s390x ppc ppc64 ppc64pseries ppc64iseries 
alpha alphaev6
-
-%description
-The Linux-native asynchronous I/O facility ("async I/O", or "aio") has a
-richer API and capability set than the simple POSIX async I/O facility.
-This library, libaio, provides the Linux-native API for async I/O.
-The POSIX async I/O facility requires this library in order to provide
-kernel-accelerated async I/O capabilities, as do applications which
-require the Linux-native async I/O API.
-
-%package devel
-Summary: Development files for Linux-native asynchronous I/O access
-Group: Development/System
-Requires: libaio
-Provides: libaio.so.1
-
-%description devel
-This package provides header files to include and libraries to link with
-for the Linux-native asynchronous I/O facility ("async I/O", or "aio").
-
-%prep
-%setup
-
-%build
-make
-
-%install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-make install prefix=$RPM_BUILD_ROOT/usr \
- libdir=$RPM_BUILD_ROOT/%{_libdir} \
- root=$RPM_BUILD_ROOT
-
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root)
-%attr(0755,root,root) %{_libdir}/libaio.so.*
-%doc COPYING TODO
-
-%files devel
-%defattr(-,root,root)
-%attr(0644,root,root) %{_includedir}/*
-%attr(0755,root,root) %{_libdir}/libaio.so
-%attr(0644,root,root) %{_libdir}/libaio.a
-
-%changelog
-* Tue Jan  3 2006 Jeff Moyer <jmoyer@xxxxxxxxxx> - 0.3.106-1
-- Add a .proc directive for the ia64_aio_raw_syscall macro.  This sounds a lot
-  like the previous entry, but that one fixed the __ia64_raw_syscall macro,
-  located in syscall-ia64.h.  This macro is in raw_syscall.c, which pretty much
-  only exists for ia64.  This bug prevented the package from building with
-  newer version of gcc.
-
-* Mon Aug  1 2005 Jeff Moyer <jmoyer@xxxxxxxxxx> - 0.3.105-1
-- Add a .proc directive for the ia64 raw syscall macro.
-
-* Fri Apr  1 2005 Jeff Moyer <jmoyer@xxxxxxxxxx> - 0.3.104-1
-- Add Alpha architecture support.  (Sergey Tikhonov <tsv@xxxxxxxx>)
-
-* Tue Jan 25 2005 Jeff Moyer <jmoyer@xxxxxxxxxx> - 0.3.103-1
-- Fix SONAME breakage.  In changing file names around, I also changed the 
-  SONAME, which is a no no.
-
-* Thu Oct 14 2004 Jeff Moyer <jmoyer@xxxxxxxxxx> - 0.3.102-1
-- S390 asm had a bug; I forgot to update the clobber list.  Lucky for me,
-  newer compilers complain about such things.
-- Also update the s390 asm to look more like the new kernel variants.
-
-* Wed Oct 13 2004 Jeff Moyer <jmoyer@xxxxxxxxxx> - 0.3.101-1
-- Revert syscall return values to be -ERRNO.  This was an inadvertant bug
-  introduced when clobber lists changed.
-- add ppc64pseries and ppc64iseries to exclusivearch
-
-* Tue Sep 14 2004 Jeff Moyer <jmoyer@xxxxxxxxxx> - 0.3.100-1
-- Switch around the tests for _PPC_ and _powerpc64_ so that the ppc64 
-  platforms get the right padding.
-
-* Wed Jul 14 2004 Jeff Moyer <jmoyer@xxxxxxxxxx> - 0.3.99-4
-- Ok, there was a race in moving the cvs module.  Someone rebuild from
-  the old cvs into fc3.  *sigh*  bumping rev.
-
-* Wed Jul 14 2004 Jeff Moyer <jmoyer@xxxxxxxxxx> - 0.3.99-3
-- Actually provide libaio.so.1.
-
-* Tue Mar 30 2004 Jeff Moyer <jmoyer@xxxxxxxxxx> - 0.3.99-2
-- Apparently the 0.3.93 patch was not meant for 0.3.96.  Backed it out.
-
-* Tue Mar 30 2004 Jeff Moyer <jmoyer@xxxxxxxxxx> - 0.3.99-1
-- Fix compat calls.
-- make library .so.1.0.0 and make symlinks properly.
-- Fix header file for inclusion in c++ code.
-
-* Thu Feb 26 2004 Jeff Moyer <jmoyer@xxxxxxxxxx> 0.3.98-2
-- bah.  fix version nr in changelog.
-
-* Thu Feb 26 2004 Jeff Moyer <jmoyer@xxxxxxxxxx> 0.3.98-1
-- fix compiler warnings.
-
-* Thu Feb 26 2004 Jeff Moyer <jmoyer@xxxxxxxxxx> 0.3.97-2
-- make srpm was using rpm to do a build.  changed that to use rpmbuild if
-  it exists, and fallback to rpm if it doesn't.
-
-* Tue Feb 24 2004 Jeff Moyer <jmoyer@xxxxxxxxxx> 0.3.97-1
-- Use libc syscall(2) instead of rolling our own calling mechanism.  This 
-  change is inspired due to a failure to build with newer gcc, since clobber 
-  lists were wrong.
-- Add -fpic to the CFLAGS for all architectures.  Should address bz #109457.
-- change a #include from <linux/types.h> to <sys/types.h>.  Fixes a build
-  issue on s390.
-
-* Wed Jul  7 2003 Bill Nottingham <notting@xxxxxxxxxx> 0.3.96-3
-- fix paths on lib64 arches
-
-* Wed Jun 18 2003 Michael K. Johnson <johnsonm@xxxxxxxxxx> 0.3.96-2
-- optimization in io_getevents from Arjan van de Ven in 0.3.96-1
-- deal with ia64 in 0.3.96-2
-
-* Wed May 28 2003 Michael K. Johnson <johnsonm@xxxxxxxxxx> 0.3.95-1
-- ppc bugfix from Julie DeWandel
-
-* Tue May 20 2003 Michael K. Johnson <johnsonm@xxxxxxxxxx> 0.3.94-1
-- symbol versioning fix from Ulrich Drepper
-
-* Mon Jan 27 2003 Benjamin LaHaise <bcrl@xxxxxxxxxx>
-- bump to 0.3.93-3 for rebuild.
-
-* Mon Dec 16 2002 Benjamin LaHaise <bcrl@xxxxxxxxxx>
-- libaio 0.3.93 test release
-- add powerpc support from Gianni Tedesco <gianni@xxxxxxxxxx>
-- add s/390 support from Arnd Bergmann <arnd@xxxxxxxxxxxxxxxxxxxx>
-
-* Fri Sep 12 2002 Benjamin LaHaise <bcrl@xxxxxxxxxx>
-- libaio 0.3.92 test release
-- build on x86-64
-
-* Thu Sep 12 2002 Benjamin LaHaise <bcrl@xxxxxxxxxx>
-- libaio 0.3.91 test release
-- build on ia64
-- remove libredhat-kernel from the .spec file
-
-* Thu Sep  5 2002 Benjamin LaHaise <bcrl@xxxxxxxxxx>
-- libaio 0.3.90 test release
-
-* Mon Apr 29 2002 Benjamin LaHaise <bcrl@xxxxxxxxxx>
-- add requires initscripts >= 6.47-1 to get boot time libredhat-kernel 
-  linkage correct.
-- typo fix
-
-* Thu Apr 25 2002 Benjamin LaHaise <bcrl@xxxxxxxxxx>
-- make /usr/lib/libredhat-kernel.so point to /lib/libredhat-kernel.so.1.0.0
-
-* Mon Apr 15 2002 Tim Powers <timp@xxxxxxxxxx>
-- make the post scriptlet not use /bin/sh
-
-* Sat Apr 12 2002 Benjamin LaHaise <bcrl@xxxxxxxxxx>
-- add /lib/libredhat-kernel* to %files.
-
-* Fri Apr 12 2002 Benjamin LaHaise <bcrl@xxxxxxxxxx>
-- make the dummy install as /lib/libredhat-kernel.so.1.0.0 so 
-  that ldconfig will link against it if no other is installed.
-
-* Tue Jan 22 2002 Benjamin LaHaise <bcrl@xxxxxxxxxx>
-- add io_getevents
-
-* Tue Jan 22 2002 Michael K. Johnson <johnsonm@xxxxxxxxxx>
-- Make linker happy with /usr/lib symlink for libredhat-kernel.so
-
-* Mon Jan 21 2002 Michael K. Johnson <johnsonm@xxxxxxxxxx>
-- Added stub library
-
-* Sun Jan 20 2002 Michael K. Johnson <johnsonm@xxxxxxxxxx>
-- Initial packaging
diff --git a/tools/libaio/man/aio.3 b/tools/libaio/man/aio.3
deleted file mode 100644
index 6dc3c63..0000000
--- a/tools/libaio/man/aio.3
+++ /dev/null
@@ -1,315 +0,0 @@
-.TH aio 3 2002-09-12 "Linux 2.4" Linux AIO"
-.SH NAME
-aio \- Asynchronous IO
-.SH SYNOPSIS
-.nf
-.B #include <errno.h>
-.sp
-.br 
-.B #include <aio.h>
-.sp
-.fi
-.SH DESCRIPTION
-The POSIX.1b standard defines a new set of I/O operations which can
-significantly reduce the time an application spends waiting at I/O.  The
-new functions allow a program to initiate one or more I/O operations and
-then immediately resume normal work while the I/O operations are
-executed in parallel.  This functionality is available if the
-.IR "unistd.h"
-file defines the symbol 
-.B "_POSIX_ASYNCHRONOUS_IO"
-.
-
-These functions are part of the library with realtime functions named
-.IR "librt"
-.  They are not actually part of the 
-.IR "libc" 
-binary.
-The implementation of these functions can be done using support in the
-kernel (if available) or using an implementation based on threads at
-userlevel.  In the latter case it might be necessary to link applications
-with the thread library 
-.IR "libpthread"
-in addition to 
-.IR "librt"
-and
-.IR "libaio"
-.
-
-All AIO operations operate on files which were opened previously.  There
-might be arbitrarily many operations running for one file.  The
-asynchronous I/O operations are controlled using a data structure named
-.IR "struct aiocb"
-It is defined in
-.IR "aio.h"
- as follows.
-
-.nf
-struct aiocb
-{
-  int aio_fildes;               /* File desriptor.  */
-  int aio_lio_opcode;           /* Operation to be performed.  */
-  int aio_reqprio;              /* Request priority offset.  */
-  volatile void *aio_buf;       /* Location of buffer.  */
-  size_t aio_nbytes;            /* Length of transfer.  */
-  struct sigevent aio_sigevent; /* Signal number and value.  */
-
-  /* Internal members.  */
-  struct aiocb *__next_prio;
-  int __abs_prio;
-  int __policy;
-  int __error_code;
-  __ssize_t __return_value;
-
-#ifndef __USE_FILE_OFFSET64
-  __off_t aio_offset;           /* File offset.  */
-  char __pad[sizeof (__off64_t) - sizeof (__off_t)];
-#else
-  __off64_t aio_offset;         /* File offset.  */
-#endif
-  char __unused[32];
-};
-
-.fi
-The POSIX.1b standard mandates that the 
-.IR "struct aiocb" 
-structure
-contains at least the members described in the following table.  There
-might be more elements which are used by the implementation, but
-depending upon these elements is not portable and is highly deprecated.
-
-.TP
-.IR "int aio_fildes"
-This element specifies the file descriptor to be used for the
-operation.  It must be a legal descriptor, otherwise the operation will
-fail.
-
-The device on which the file is opened must allow the seek operation.
-I.e., it is not possible to use any of the AIO operations on devices
-like terminals where an 
-.IR "lseek"
- call would lead to an error.
-.TP
-.IR "off_t aio_offset"
-This element specifies the offset in the file at which the operation (input
-or output) is performed.  Since the operations are carried out in arbitrary
-order and more than one operation for one file descriptor can be
-started, one cannot expect a current read/write position of the file
-descriptor.
-.TP
-.IR "volatile void *aio_buf"
-This is a pointer to the buffer with the data to be written or the place
-where the read data is stored.
-.TP
-.IR "size_t aio_nbytes"
-This element specifies the length of the buffer pointed to by 
-.IR "aio_buf"
-.
-.TP
-.IR "int aio_reqprio"
-If the platform has defined 
-.B "_POSIX_PRIORITIZED_IO"
-and
-.B "_POSIX_PRIORITY_SCHEDULING"
-, the AIO requests are
-processed based on the current scheduling priority.  The
-.IR "aio_reqprio"
-element can then be used to lower the priority of the
-AIO operation.
-.TP
-.IR "struct sigevent aio_sigevent"
-This element specifies how the calling process is notified once the
-operation terminates.  If the 
-.IR "sigev_notify"
-element is
-.B "SIGEV_NONE"
-, no notification is sent.  If it is 
-.B "SIGEV_SIGNAL"
-,
-the signal determined by 
-.IR "sigev_signo"
-is sent.  Otherwise,
-.IR "sigev_notify"
-must be 
-.B "SIGEV_THREAD"
-.  In this case, a thread
-is created which starts executing the function pointed to by
-.IR "sigev_notify_function"
-.
-.TP
-.IR "int aio_lio_opcode"
-This element is only used by the 
-.IR "lio_listio"
- and
-.IR "lio_listio64"
- functions.  Since these functions allow an
-arbitrary number of operations to start at once, and each operation can be
-input or output (or nothing), the information must be stored in the
-control block.  The possible values are:
-.TP
-.B "LIO_READ"
-Start a read operation.  Read from the file at position
-.IR "aio_offset"
- and store the next 
-.IR "aio_nbytes"
- bytes in the
-buffer pointed to by 
-.IR "aio_buf"
-.
-.TP
-.B "LIO_WRITE"
-Start a write operation.  Write 
-.IR "aio_nbytes" 
-bytes starting at
-.IR "aio_buf"
-into the file starting at position 
-.IR "aio_offset"
-.
-.TP
-.B "LIO_NOP"
-Do nothing for this control block.  This value is useful sometimes when
-an array of 
-.IR "struct aiocb"
-values contains holes, i.e., some of the
-values must not be handled although the whole array is presented to the
-.IR "lio_listio"
-function.
-
-When the sources are compiled using 
-.B "_FILE_OFFSET_BITS == 64"
-on a
-32 bit machine, this type is in fact 
-.IR "struct aiocb64"
-, since the LFS
-interface transparently replaces the 
-.IR "struct aiocb"
-definition.
-.PP
-For use with the AIO functions defined in the LFS, there is a similar type
-defined which replaces the types of the appropriate members with larger
-types but otherwise is equivalent to 
-.IR "struct aiocb"
-.  Particularly,
-all member names are the same.
-
-.nf
-/* The same for the 64bit offsets.  Please note that the members aio_fildes
-   to __return_value have to be the same in aiocb and aiocb64.  */
-#ifdef __USE_LARGEFILE64
-struct aiocb64
-{
-  int aio_fildes;               /* File desriptor.  */
-  int aio_lio_opcode;           /* Operation to be performed.  */
-  int aio_reqprio;              /* Request priority offset.  */
-  volatile void *aio_buf;       /* Location of buffer.  */
-  size_t aio_nbytes;            /* Length of transfer.  */
-  struct sigevent aio_sigevent; /* Signal number and value.  */
-
-  /* Internal members.  */
-  struct aiocb *__next_prio;
-  int __abs_prio;
-  int __policy;
-  int __error_code;
-  __ssize_t __return_value;
-
-  __off64_t aio_offset;         /* File offset.  */
-  char __unused[32];
-};
-
-.fi
-.TP
-.IR "int aio_fildes"
-This element specifies the file descriptor which is used for the
-operation.  It must be a legal descriptor since otherwise the operation
-fails for obvious reasons.
-The device on which the file is opened must allow the seek operation.
-I.e., it is not possible to use any of the AIO operations on devices
-like terminals where an 
-.IR "lseek"
- call would lead to an error.
-.TP
-.IR "off64_t aio_offset"
-This element specifies at which offset in the file the operation (input
-or output) is performed.  Since the operation are carried in arbitrary
-order and more than one operation for one file descriptor can be
-started, one cannot expect a current read/write position of the file
-descriptor.
-.TP
-.IR "volatile void *aio_buf"
-This is a pointer to the buffer with the data to be written or the place
-where the read data is stored.
-.TP
-.IR "size_t aio_nbytes"
-This element specifies the length of the buffer pointed to by 
-.IR "aio_buf"
-.
-.TP
-.IR "int aio_reqprio"
-If for the platform 
-.B "_POSIX_PRIORITIZED_IO"
-and
-.B "_POSIX_PRIORITY_SCHEDULING"
-are defined the AIO requests are
-processed based on the current scheduling priority.  The
-.IR "aio_reqprio"
-element can then be used to lower the priority of the
-AIO operation.
-.TP
-.IR "struct sigevent aio_sigevent"
-This element specifies how the calling process is notified once the
-operation terminates.  If the 
-.IR "sigev_notify"
-, element is
-.B "SIGEV_NONE"
-no notification is sent.  If it is 
-.B "SIGEV_SIGNAL"
-,
-the signal determined by 
-.IR "sigev_signo"
-is sent.  Otherwise,
-.IR "sigev_notify"
- must be 
-.B "SIGEV_THREAD"
-in which case a thread
-which starts executing the function pointed to by
-.IR "sigev_notify_function"
-.
-.TP
-.IR "int aio_lio_opcode"
-This element is only used by the 
-.IR "lio_listio"
-and
-.IR "lio_listio64"
-functions.  Since these functions allow an
-arbitrary number of operations to start at once, and since each operation can 
be
-input or output (or nothing), the information must be stored in the
-control block.  See the description of 
-.IR "struct aiocb"
-for a description
-of the possible values.
-.PP
-When the sources are compiled using 
-.B "_FILE_OFFSET_BITS == 64"
-on a
-32 bit machine, this type is available under the name 
-.IR "struct aiocb64"
-, since the LFS transparently replaces the old interface.
-.SH "RETURN VALUES"
-.SH ERRORS
-.SH "SEE ALSO"
-.BR aio_cancel(3),
-.BR aio_cancel64(3),
-.BR aio_error(3),
-.BR aio_error64(3),
-.BR aio_fsync(3),
-.BR aio_fsync64(3),
-.BR aio_init(3),
-.BR aio_read(3),
-.BR aio_read64(3),
-.BR aio_return(3),
-.BR aio_return64(3),
-.BR aio_suspend(3),
-.BR aio_suspend64(3),
-.BR aio_write(3),
-.BR aio_write64(3),
-.BR errno(3),
diff --git a/tools/libaio/man/aio_cancel.3 b/tools/libaio/man/aio_cancel.3
deleted file mode 100644
index 502c83c..0000000
--- a/tools/libaio/man/aio_cancel.3
+++ /dev/null
@@ -1,137 +0,0 @@
-.TH aio_cancel 3 2002-09-12 "Linux 2.4" Linux AIO"
-.SH NAME
-aio_cancel - Cancel asynchronous I/O requests
-.SH SYNOPSYS
-.nf
-.B #include <errno.h>
-.sp
-.br 
-.B #include <aio.h>
-.sp
-.br
-.BI "int aio_cancel (int fildes " , struct aiocb *aiocbp " )"
-.fi
-.SH DESCRIPTION
-When one or more requests are asynchronously processed, it might be
-useful in some situations to cancel a selected operation, e.g., if it
-becomes obvious that the written data is no longer accurate and would
-have to be overwritten soon.  As an example, assume an application, which
-writes data in files in a situation where new incoming data would have
-to be written in a file which will be updated by an enqueued request.
-The POSIX AIO implementation provides such a function, but this function
-is not capable of forcing the cancellation of the request.  It is up to the
-implementation to decide whether it is possible to cancel the operation
-or not.  Therefore using this function is merely a hint.
-.B "The libaio implementation does not implement the cancel operation in the"
-.B "POSIX libraries".
-.PP
-The 
-.IR aio_cancel
-function can be used to cancel one or more
-outstanding requests.  If the 
-.IR aiocbp 
-parameter is 
-.IR NULL
-, the
-function tries to cancel all of the outstanding requests which would process
-the file descriptor 
-.IR fildes 
-(i.e., whose 
-.IR aio_fildes 
-member
-is 
-.IR fildes
-).  If 
-.IR aiocbp is not 
-.IR  NULL
-,
-.IR aio_cancel
-attempts to cancel the specific request pointed to by 
-.IR aiocbp.
-
-For requests which were successfully canceled, the normal notification
-about the termination of the request should take place.  I.e., depending
-on the 
-.IR "struct sigevent" 
-object which controls this, nothing
-happens, a signal is sent or a thread is started.  If the request cannot
-be canceled, it terminates the usual way after performing the operation.
-After a request is successfully canceled, a call to 
-.IR aio_error
-with
-a reference to this request as the parameter will return
-.B ECANCELED
-and a call to 
-.IR aio_return
-will return 
-.IR -1.
-If the request wasn't canceled and is still running the error status is
-still 
-.B EINPROGRESS.
-When the sources are compiled with 
-.IR "_FILE_OFFSET_BITS == 64"
-, this
-function is in fact 
-.IR aio_cancel64
-since the LFS interface
-transparently replaces the normal implementation.
-
-.SH "RETURN VALUES"
-.TP
-.B AIO_CANCELED
-If there were
-requests which haven't terminated and which were successfully canceled.
-.TP
-.B AIO_NOTCANCELED
-If there is one or more requests left which couldn't be canceled,
-.  In this case
-.IR aio_error
-must be used to find out which of the, perhaps multiple, requests (in
-.IR aiocbp
-is 
-.IR NULL
-) weren't successfully canceled.  
-.TP
-.B AIO_ALLDONE
-If all
-requests already terminated at the time 
-.IR aio_cancel 
-is called the
-return value is 
-.
-.SH ERRORS
-If an error occurred during the execution of 
-.IR aio_cancel 
-the
-function returns 
-.IR -1
-and sets 
-.IR errno
-to one of the following
-values.
-.TP
-.B EBADF
-The file descriptor 
-.IR fildes
-is not valid.
-.TP
-.B ENOSYS
-.IR aio_cancel
-is not implemented.
-.SH "SEE ALSO"
-.BR aio(3),
-.BR aio_cancel64(3),
-.BR aio_error(3),
-.BR aio_error64(3),
-.BR aio_fsync(3),
-.BR aio_fsync64(3),
-.BR aio_init(3),
-.BR aio_read(3),
-.BR aio_read64(3),
-.BR aio_return(3),
-.BR aio_return64(3),
-.BR aio_suspend(3),
-.BR aio_suspend64(3),
-.BR aio_write(3),
-.BR aio_write64(3),
-.BR errno(3),
diff --git a/tools/libaio/man/aio_cancel64.3 b/tools/libaio/man/aio_cancel64.3
deleted file mode 100644
index ede775b..0000000
--- a/tools/libaio/man/aio_cancel64.3
+++ /dev/null
@@ -1,50 +0,0 @@
-.TH aio_cancel64 3 2002-09-12 "Linux 2.4" Linux AIO"
-.SH NAME
-aio_cancel64 \- Cancel asynchronous I/O requests
-.SH SYNOPSYS
-.nf
-.B #include <errno.h>
-.sp
-.br 
-.B #include <aio.h>
-.sp
-.br
-.BI "int aio_cancel64 (int fildes, struct aiocb64 *aiocbp)"
-.fi
-.SH DESCRIPTION
-This function is similar to 
-.IR aio_cancel
-with the only difference
-that the argument is a reference to a variable of type 
-.IR struct aiocb64
-.
-
-When the sources are compiled with 
-.IR _FILE_OFFSET_BITS == 64
-, this
-function is available under the name 
-.IR aio_cancel
-and so
-transparently replaces the interface for small files on 32 bit
-machines.
-.SH "RETURN VALUES"
-See aio_cancel(3).
-.SH ERRORS
-See aio_cancel(3).
-.SH "SEE ALSO"
-.BR aio(3),
-.BR aio_cancel(3),
-.BR aio_error(3),
-.BR aio_error64(3),
-.BR aio_fsync(3),
-.BR aio_fsync64(3),
-.BR aio_init(3),
-.BR aio_read(3),
-.BR aio_read64(3),
-.BR aio_return(3),
-.BR aio_return64(3),
-.BR aio_suspend(3),
-.BR aio_suspend64(3),
-.BR aio_write(3),
-.BR aio_write64(3),
-.BR errno(3),
diff --git a/tools/libaio/man/aio_error.3 b/tools/libaio/man/aio_error.3
deleted file mode 100644
index 12b82cf..0000000
--- a/tools/libaio/man/aio_error.3
+++ /dev/null
@@ -1,81 +0,0 @@
-.TH aio_error 3 2002-09-12 "Linux 2.4" Linux AIO"
-.SH NAME
-aio_error \- Getting the Status of AIO Operations
-.SH SYNOPSYS
-.nf
-.B #include <errno.h>
-.sp
-.br 
-.B #include <aio.h>
-.sp
-.br
-.BI "int aio_error (const struct aiocb *aiocbp)"
-.fi
-.SH DESCRIPTION
-The function
-.IR aio_error
-determines the error state of the request described by the
-.IR "struct aiocb"
-variable pointed to by 
-.I aiocbp
-. 
-
-When the operation is performed truly asynchronously (as with
-.IR "aio_read"
-and 
-.IR "aio_write"
-and with 
-.IR "lio_listio"
-when the mode is 
-.IR "LIO_NOWAIT"
-), one sometimes needs to know whether a
-specific request already terminated and if so, what the result was.
-When the sources are compiled with 
-.IR "_FILE_OFFSET_BITS == 64"
-this function is in fact 
-.IR "aio_error64"
-since the LFS interface transparently replaces the normal implementation.
-.SH "RETURN VALUES"
-If the request has not yet terminated the value returned is always
-.IR "EINPROGRESS"
-.  Once the request has terminated the value
-.IR "aio_error"
-returns is either 
-.I 0
-if the request completed successfully or it returns the value which would be 
stored in the
-.IR "errno"
-variable if the request would have been done using
-.IR "read"
-, 
-.IR "write"
-, or 
-.IR "fsync"
-.
-.SH ERRORS
-.TP
-.IR "ENOSYS"
-if it is not implemented.  It
-could also return 
-.TP
-.IR "EINVAL"
-if the 
-.I aiocbp
-parameter does not
-refer to an asynchronous operation whose return status is not yet known.
-.SH "SEE ALSO"
-.BR aio(3),
-.BR aio_cancel(3),
-.BR aio_cancel64(3),
-.BR aio_error64(3),
-.BR aio_fsync(3),
-.BR aio_fsync64(3),
-.BR aio_init(3),
-.BR aio_read(3),
-.BR aio_read64(3),
-.BR aio_return(3),
-.BR aio_return64(3),
-.BR aio_suspend(3),
-.BR aio_suspend64(3),
-.BR aio_write(3),
-.BR aio_write64(3),
-.BR errno(3),
diff --git a/tools/libaio/man/aio_error64.3 b/tools/libaio/man/aio_error64.3
deleted file mode 100644
index 3333161..0000000
--- a/tools/libaio/man/aio_error64.3
+++ /dev/null
@@ -1,64 +0,0 @@
-.TH aio_error64 3 2002-09-12 "Linux 2.4" Linux AIO"
-.SH NAME
-aio_error64 \- Return errors
-.SH SYNOPSYS
-.nf
-.B #include <errno.h>
-.sp
-.br 
-.B #include <aio.h>
-.sp
-.br
-.BI "int aio_error64 (const struct aiocb64 *aiocbp)"
-.fi
-.SH DESCRIPTION
-This function is similar to 
-.IR aio_error
-with the only difference
-that the argument is a reference to a variable of type 
-.IR "struct aiocb64".
-.PP
-When the sources are compiled with 
-.IR "_FILE_OFFSET_BITS == 64"
-this
-function is available under the name 
-.IR aio_error
-and so
-transparently replaces the interface for small files on 32 bit
-machines.
-.SH "RETURN VALUES"
-If the request has not yet terminated the value returned is always
-.IR "EINPROGRESS"
-.  Once the request has terminated the value
-.IR "aio_error"
-returns is either 
-.I 0
-if the request completed successfully or it returns the value which would be 
stored in the
-.IR "errno"
-variable if the request would have been done using
-.IR "read"
-, 
-.IR "write"
-, or 
-.IR "fsync"
-.
-.SH ERRORS
-See 
-.IR aio_error(3).
-.SH "SEE ALSO"
-.BR aio(3),
-.BR aio_cancel(3),
-.BR aio_cancel64(3),
-.BR aio_error(3),
-.BR aio_fsync(3),
-.BR aio_fsync64(3),
-.BR aio_init(3),
-.BR aio_read(3),
-.BR aio_read64(3),
-.BR aio_return(3),
-.BR aio_return64(3),
-.BR aio_suspend(3),
-.BR aio_suspend64(3),
-.BR aio_write(3),
-.BR aio_write64(3),
-.BR errno(3),
diff --git a/tools/libaio/man/aio_fsync.3 b/tools/libaio/man/aio_fsync.3
deleted file mode 100644
index 637f0f6..0000000
--- a/tools/libaio/man/aio_fsync.3
+++ /dev/null
@@ -1,139 +0,0 @@
-.TH aio_fsync 3 2002-09-12 "Linux 2.4" Linux AIO"
-.SH NAME
-aio_fsync \- Synchronize a file's complete in-core state with that on disk
-.SH SYNOPSYS
-.nf
-.B #include <errno.h>
-.sp
-.br 
-.B #include <aio.h>
-.sp
-.br
-.BI "int aio_fsync (int op, struct aiocb aiocbp)"
-.fi
-.SH DESCRIPTION
-.PP
-When dealing with asynchronous operations it is sometimes necessary to
-get into a consistent state.  This would mean for AIO that one wants to
-know whether a certain request or a group of request were processed.
-This could be done by waiting for the notification sent by the system
-after the operation terminated, but this sometimes would mean wasting
-resources (mainly computation time).  Instead POSIX.1b defines two
-functions which will help with most kinds of consistency.
-.PP
-The
-.IR aio_fsync
-and 
-.IR "aio_fsync64"
-functions are only available
-if the symbol 
-.IR "_POSIX_SYNCHRONIZED_IO"
-is defined in 
-.I unistd.h
-.
-
-Calling this function forces all I/O operations operating queued at the
-time of the function call operating on the file descriptor
-.IR "aiocbp->aio_fildes"
-into the synchronized I/O completion state .  The 
-.IR "aio_fsync"
-function returns
-immediately but the notification through the method described in
-.IR "aiocbp->aio_sigevent"
-will happen only after all requests for this
-file descriptor have terminated and the file is synchronized.  This also
-means that requests for this very same file descriptor which are queued
-after the synchronization request are not affected.
-
-If 
-.IR "op"
-is 
-.IR "O_DSYNC"
-the synchronization happens as with a call
-to 
-.IR "fdatasync"
-.  Otherwise 
-.IR "op"
-should be 
-.IR "O_SYNC"
-and
-the synchronization happens as with 
-.IR "fsync"
-.
-
-As long as the synchronization has not happened, a call to
-.IR "aio_error"
-with the reference to the object pointed to by
-.IR "aiocbp"
-returns 
-.IR "EINPROGRESS"
-.  Once the synchronization is
-done 
-.IR "aio_error"
-return 
-.IR 0
-if the synchronization was not
-successful.  Otherwise the value returned is the value to which the
-.IR "fsync"
-or 
-.IR "fdatasync"
-function would have set the
-.IR "errno"
-variable.  In this case nothing can be assumed about the
-consistency for the data written to this file descriptor.
-
-.SH "RETURN VALUES"
-The return value of this function is 
-.IR 0
-if the request was
-successfully enqueued.  Otherwise the return value is 
-.IR -1
-and
-.IR "errno".
-.SH ERRORS
-.TP
-.B EAGAIN
-The request could not be enqueued due to temporary lack of resources.
-.TP
-.B EBADF
-The file descriptor 
-.IR "aiocbp->aio_fildes"
-is not valid or not open
-for writing.
-.TP
-.B EINVAL
-The implementation does not support I/O synchronization or the 
-.IR "op"
-parameter is other than 
-.IR "O_DSYNC"
-and 
-.IR "O_SYNC"
-.
-.TP
-.B ENOSYS
-This function is not implemented.
-.PP
-When the sources are compiled with 
-.IR "_FILE_OFFSET_BITS == 64"
- this
-function is in fact 
-.IR "aio_return64"
-since the LFS interface
-transparently replaces the normal implementation.
-.SH "SEE ALSO"
-.BR aio(3),
-.BR aio_cancel(3),
-.BR aio_cancel64(3),
-.BR aio_error(3),
-.BR aio_error64(3),
-.BR aio_fsync64(3),
-.BR aio_init(3),
-.BR aio_read(3),
-.BR aio_read64(3),
-.BR aio_return(3),
-.BR aio_return64(3),
-.BR aio_suspend(3),
-.BR aio_suspend64(3),
-.BR aio_write(3),
-.BR aio_write64(3),
-.BR errno(3),
diff --git a/tools/libaio/man/aio_fsync64.3 b/tools/libaio/man/aio_fsync64.3
deleted file mode 100644
index 5dce22d..0000000
--- a/tools/libaio/man/aio_fsync64.3
+++ /dev/null
@@ -1,51 +0,0 @@
-.TH aio_fsync64 3 2002-09-12 "Linux 2.4" Linux AIO"
-.SH NAME
-aio_fsync64 \- Synchronize a file's complete in-core state with that on disk
-.SH SYNOPSYS
-.nf
-.B #include <errno.h>
-.sp
-.br 
-.B #include <aio.h>
-.sp
-.br
-.BI "int aio_fsync64 (int op, struct aiocb64 *aiocbp)"
-.fi
-.SH DESCRIPTION
-This function is similar to 
-.IR aio_fsync
-with the only difference
-that the argument is a reference to a variable of type 
-.IR "struct aiocb64".
-
-When the sources are compiled with 
-.IR "_FILE_OFFSET_BITS == 64"
-this
-function is available under the name 
-.IR aio_fsync
-and so
-transparently replaces the interface for small files on 32 bit
-machines.
-.SH "RETURN VALUES"
-See 
-.IR aio_fsync.
-.SH ERRORS
-See 
-.IR aio_fsync.
-.SH "SEE ALSO"
-.BR aio(3),
-.BR aio_cancel(3),
-.BR aio_cancel64(3),
-.BR aio_error(3),
-.BR aio_error64(3),
-.BR aio_fsync(3),

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.