fstests: remove DMAPI support from build system

Since we've axed all the DMAPI tests, get rid of the build system
support too.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/Makefile b/Makefile
index 48927bcd361bcc3054420ba20fe3aaf8ffc1fa5c..86a2d3996e5288f61e4be1f33b2b0d81d045940e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ TOOL_SUBDIRS = ltp src m4 common
 export TESTS_DIR = tests
 SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS) $(TESTS_DIR)
 
 export TESTS_DIR = tests
 SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS) $(TESTS_DIR)
 

-default: include/builddefs $(DMAPI_MAKEFILE)
+default: include/builddefs

 ifeq ($(HAVE_BUILDDEFS), no)
        $(Q)$(MAKE) $(MAKEOPTS) $@
 else
 ifeq ($(HAVE_BUILDDEFS), no)
        $(Q)$(MAKE) $(MAKEOPTS) $@
 else

diff --git a/build/rpm/xfstests.spec.in b/build/rpm/xfstests.spec.in
index 0a8c896b5888d0cf9c861e13ff54e166fe1fac83..e0f7c5f92dedfd3809dd54d787de33a4ec7759be 100644 (file)
--- a/build/rpm/xfstests.spec.in
+++ b/build/rpm/xfstests.spec.in
@@ -17,7 +17,7 @@ Group: System Environment/Base
 
 %description
 The XFS regression test suite.  Also includes some support for
 
 %description
 The XFS regression test suite.  Also includes some support for

-acl, attr, dmapi, udf, and nfs testing.  Contains around 200 specific tests
+acl, attr, udf, and nfs testing.  Contains around 200 specific tests

 for userspace & kernelspace.
 
 %prep
 for userspace & kernelspace.
 
 %prep

diff --git a/common/rc b/common/rc
index aa9962c3b1a8add96f1648ce75ee0e03ba6d7219..aea0d076d111e4b12b0b74bbd77c6c924e5c554a 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -277,7 +277,6 @@ _mount_ops_filter()
     local params="$*"
     local last_index=$(( $# - 1 ))
 
     local params="$*"
     local last_index=$(( $# - 1 ))
 

-    #get mount point to handle dmapi mtpt option correctly

     [ $last_index -gt 0 ] && shift $last_index
     local fs_escaped=$1
 
     [ $last_index -gt 0 ] && shift $last_index
     local fs_escaped=$1
 

diff --git a/configure.ac b/configure.ac
index e57712857db1a3409dccaf559c1e7097d12a704d..27d57d63cb4ee9fb02a561218c52f5b45cd5b7f8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,6 @@ AC_PACKAGE_NEED_ACLINIT_LIBACL
 AC_PACKAGE_WANT_GDBM
 AC_PACKAGE_WANT_AIO
 AC_PACKAGE_WANT_URING
 AC_PACKAGE_WANT_GDBM
 AC_PACKAGE_WANT_AIO
 AC_PACKAGE_WANT_URING

-AC_PACKAGE_WANT_DMAPI

 AC_PACKAGE_WANT_LINUX_FIEMAP_H
 AC_PACKAGE_WANT_FALLOCATE
 AC_PACKAGE_WANT_OPEN_BY_HANDLE_AT
 AC_PACKAGE_WANT_LINUX_FIEMAP_H
 AC_PACKAGE_WANT_FALLOCATE
 AC_PACKAGE_WANT_OPEN_BY_HANDLE_AT

diff --git a/include/builddefs.in b/include/builddefs.in
index 6893d598b154c0ff2cb7eb05bb6ff7ee89369d61..471e651c95626646c0b190a244a0fde443a23769 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -63,7 +63,6 @@ HAVE_AIO = @have_aio@
 HAVE_URING = @have_uring@
 HAVE_FALLOCATE = @have_fallocate@
 HAVE_OPEN_BY_HANDLE_AT = @have_open_by_handle_at@
 HAVE_URING = @have_uring@
 HAVE_FALLOCATE = @have_fallocate@
 HAVE_OPEN_BY_HANDLE_AT = @have_open_by_handle_at@

-HAVE_DMAPI = @have_dmapi@

 HAVE_FIEMAP = @have_fiemap@
 HAVE_FALLOCATE = @have_fallocate@
 HAVE_COPY_FILE_RANGE = @have_copy_file_range@
 HAVE_FIEMAP = @have_fiemap@
 HAVE_FALLOCATE = @have_fallocate@
 HAVE_COPY_FILE_RANGE = @have_copy_file_range@

diff --git a/m4/Makefile b/m4/Makefile
index 5d9c5896f5a7439fb5da3c1034c0358773faecd5..f3f195c5373131a0524b165fa0a81e04740cb1ba 100644 (file)
--- a/m4/Makefile
+++ b/m4/Makefile
@@ -10,7 +10,6 @@ LSRCFILES = \
        package_acldev.m4 \
        package_aiodev.m4 \
        package_gdbmdev.m4 \
        package_acldev.m4 \
        package_aiodev.m4 \
        package_gdbmdev.m4 \

-       package_dmapidev.m4 \

        package_globals.m4 \
        package_libcdev.m4 \
        package_liburing.m4 \
        package_globals.m4 \
        package_libcdev.m4 \
        package_liburing.m4 \

diff --git a/m4/package_dmapidev.m4 b/m4/package_dmapidev.m4
deleted file mode 100644 (file)
index 6a7257e..0000000
--- a/m4/package_dmapidev.m4
+++ /dev/null
@@ -1,27 +0,0 @@
-AC_DEFUN([AC_PACKAGE_NEED_XFS_DMAPI_H],
-  [ AC_CHECK_HEADERS([xfs/dmapi.h])
-    if test "$ac_cv_header_xfs_dmapi_h" != yes; then
-        echo
-        echo 'FATAL ERROR: could not find a valid DMAPI library header.'
-        echo 'Install the data migration API (dmapi) development package.'
-        echo 'Alternatively, run "make install-dev" from the dmapi source.'
-        exit 1
-    fi
-  ])
-
-AC_DEFUN([AC_PACKAGE_WANT_DMAPI],
-  [ AC_CHECK_LIB(dm, dm_make_handle, [ have_dmapi=true ], [
-       have_dmapi=false
-        echo
-        echo 'WARNING: could not find a valid DMAPI base library.'
-       echo 'If you want DMAPI support please install the data migration'
-       echo 'API (dmapi) library package. Alternatively, run "make install"'
-       echo 'from the dmapi source.'
-       echo
-    ])
-    libdm="-ldm"
-    test -f ${libexecdir}${libdirsuffix}/libdm.la && \
-       libdm="${libexecdir}${libdirsuffix}/libdm.la"
-    AC_SUBST(libdm)
-    AC_SUBST(have_dmapi)
-  ])

diff --git a/tools/auto-qa b/tools/auto-qa
index 1d0cc07cc0a4be9dc63d24322841567294238412..1beb2835916504bf08fb49910fb5ec1f03265c94 100755 (executable)
--- a/tools/auto-qa
+++ b/tools/auto-qa
@@ -308,7 +308,7 @@ do
 
        *cleantools)
            # we need to configure or else we might fail to clean
 
        *cleantools)
            # we need to configure or else we might fail to clean

-           for pkg in attr acl xfsprogs dmapi xfsdump xfstests
+           for pkg in attr acl xfsprogs xfsdump xfstests

            do
                [ -d $WORKAREA/$pkg ] || continue
                cd $WORKAREA/$pkg
            do
                [ -d $WORKAREA/$pkg ] || continue
                cd $WORKAREA/$pkg


@@ -321,7 +321,7 @@ do
 
        *buildtools)
            _log "      *** build and install tools"
 
        *buildtools)
            _log "      *** build and install tools"

-           for pkg in attr acl xfsprogs dmapi xfsdump xfstests 
+           for pkg in attr acl xfsprogs xfsdump xfstests 

            do
                [ -d $WORKAREA/$pkg ] || continue
                cd $WORKAREA/$pkg
            do
                [ -d $WORKAREA/$pkg ] || continue
                cd $WORKAREA/$pkg