samba4: add proper io_uring kernel detection

* add proper io_uring kernel detection

Signed-off-by: Andy Walsh <redacted>

diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 7b983fd8c69a874afda14695dd69deacec0604ac..ecdbdc91325e66420a16d1cfe9d4af610b13761e 100644 (file)
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=samba
 PKG_VERSION:=4.13.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:= \

diff --git a/net/samba4/files/samba.init b/net/samba4/files/samba.init
index db4ce6c1b224c39fe9845b4cea6cb5dcc744cab6..3fd48d8cbc03db62a8607aac7aeb45757d5a4ad1 100644 (file)
--- a/net/samba4/files/samba.init
+++ b/net/samba4/files/samba.init
@@ -144,9 +144,14 @@ smb_add_share() {
                fi
                
                # always enable io_uring if we can
-               if [ "$DISABLE_ASYNC_IO" -ne 1 ] && [ -e /usr/lib/samba/vfs/io_uring.so ]; then
+               if [ "$DISABLE_ASYNC_IO" -ne 1 ] && [ -e /usr/lib/samba/vfs/io_uring.so ] && grep "io_uring_setup" /proc/kallsyms >>2 ; then
+                       logger -p daemon.info -t 'samba4-server' "io_uring support found in kernel, enabling VFS io_uring."
                        # make sure its last in list
-                       vfs_objects="$vfs_objects io_uring"
+                       if [ -n "$vfs_objects" ]; then
+                               vfs_objects="$vfs_objects io_uring"
+                       else
+                               vfs_objects="io_uring"
+                       fi
                fi
 
                [ -n "$vfs_objects" ] && printf "\tvfs objects = %s\n" "$vfs_objects"