From: Jens Axboe <axboe@kernel.dk>
Date: Mon, 9 Nov 2020 16:59:07 +0000 (-0700)
Subject: Remove the "libaio over io_uring" mode
X-Git-Tag: fio-3.24~6
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d4946e79e833d3b89bddf7d065e9f66560755e75;p=fio.git

Remove the "libaio over io_uring" mode

Not going to maintain this mode in liburing, so just get rid of it. It's
also caused some confusion where users think they need this enabled to
run io_uring, which isn't the case.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/Makefile b/Makefile
index ac3a590c..ca454318 100644
--- a/Makefile
+++ b/Makefile
@@ -87,11 +87,6 @@ endif
 ifdef CONFIG_LIBAIO
   libaio_SRCS = engines/libaio.c
   libaio_LIBS = -laio
-  ifdef CONFIG_LIBAIO_URING
-    libaio_LIBS = -luring
-  else
-    libaio_LIBS = -laio
-  endif
   ENGINES += libaio
 endif
 ifdef CONFIG_RDMA
diff --git a/configure b/configure
index 39a9248d..5d4b6e91 100755
--- a/configure
+++ b/configure
@@ -168,7 +168,6 @@ disable_native="no"
 march_set="no"
 libiscsi="no"
 libnbd="no"
-libaio_uring="no"
 libzbc=""
 dynamic_engines="no"
 prefix=/usr/local
@@ -237,8 +236,6 @@ for opt do
   ;;
   --disable-tcmalloc) disable_tcmalloc="yes"
   ;;
-  --enable-libaio-uring) libaio_uring="yes"
-  ;;
   --dynamic-libengines) dynamic_engines="yes"
   ;;
   --help)
@@ -653,22 +650,13 @@ int main(void)
   return 0;
 }
 EOF
-  if test "$libaio_uring" = "yes"; then
-    if compile_prog "" "-luring" "libaio io_uring" ; then
-      libaio=yes
-      LIBS="-luring $LIBS"
-    else
-      feature_not_found "libaio io_uring" ""
-    fi
-  elif compile_prog "" "-laio" "libaio" ; then
+  if compile_prog "" "-laio" "libaio" ; then
     libaio=yes
-    libaio_uring=no
   else
     if test "$libaio" = "yes" ; then
       feature_not_found "linux AIO" "libaio-dev or libaio-devel"
     fi
     libaio=no
-    libaio_uring=no
   fi
 
   cat > $TMPC <<EOF
@@ -689,7 +677,6 @@ EOF
 fi
 print_config "Linux AIO support" "$libaio"
 print_config "Linux AIO support rw flags" "$libaio_rw_flags"
-print_config "Linux AIO over io_uring" "$libaio_uring"
 
 ##########################################
 # posix aio probe
@@ -2722,9 +2709,6 @@ if test "$libaio" = "yes" ; then
   if test "$libaio_rw_flags" = "yes" ; then
     output_sym "CONFIG_LIBAIO_RW_FLAGS"
   fi
-  if test "$libaio_uring" = "yes" ; then
-    output_sym "CONFIG_LIBAIO_URING"
-  fi
 fi
 if test "$posix_aio" = "yes" ; then
   output_sym "CONFIG_POSIXAIO"