3 files changed, 5 insertions, 37 deletions

diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests/0001-ltp-fsx.h-Explicitly-use-int-for-return-type-for-aio.patch b/meta-filesystems/recipes-utils/xfstests/xfstests/0001-ltp-fsx.h-Explicitly-use-int-for-return-type-for-aio.patch
deleted file mode 100644
index 5e9e9d9a79..0000000000
--- a/meta-filesystems/recipes-utils/xfstests/xfstests/0001-ltp-fsx.h-Explicitly-use-int-for-return-type-for-aio.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0927d0def968ea7e19905c7e39182f65961c11cf Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 5 Nov 2023 01:17:52 -0700
-Subject: [PATCH] ltp/fsx.h: Explicitly use int for return type for aio_rw()
-
-Fixes build with clang-17+
-error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int]
-
-Upstream-Status: Submitted [https://marc.info/?l=fstests&m=169917222008646&w=2]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- ltp/fsx.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ltp/fsx.c b/ltp/fsx.c
-index ee4b8fe4..c0aec23f 100644
---- a/ltp/fsx.c
-+++ b/ltp/fsx.c
-@@ -2581,7 +2581,7 @@ out_error:
-        return -1;
- }
- #else
--aio_rw(int rw, int fd, char *buf, unsigned len, unsigned offset)
-+int aio_rw(int rw, int fd, char *buf, unsigned len, unsigned offset)
- {
-        fprintf(stderr, "io_rw: need AIO support!\n");
-        exit(111);
--- 
-2.42.1
-
diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch b/meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch
index 856fd270f5..e823297343 100644
--- a/meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch
+++ b/meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch
@@ -1,4 +1,4 @@
-From 559f685f83d12d11bf9ec6c6ce924ee4d0702a2a Mon Sep 17 00:00:00 2001
+From 79c4715a46b80653eb98b61731c094c85e969220 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 14 Aug 2022 13:33:05 -0700
 Subject: [PATCH] Drop detached_mounts_propagation and remove sys/mount.h from
@@ -12,21 +12,20 @@ testcase
 Upstream-Status: Inappropriate [Libc specific Workaround]
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
 ---
  src/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index 2815f919..448fccc9 100644
+index e7442487..970f087a 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -32,7 +32,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \
+@@ -33,7 +33,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \
         dio-invalidate-cache stat_test t_encrypted_d_revalidate \
         attr_replace_test swapon mkswap t_attr_corruption t_open_tmpfiles \
         fscrypt-crypt-util bulkstat_null_ocount splice-test chprojid_fail \
 -       detached_mounts_propagation ext4_resize t_readdir_3 splice2pipe \
 +       ext4_resize t_readdir_3 splice2pipe \
-        uuid_ioctl
+        uuid_ioctl t_snapshot_deleted_subvolume
  
  EXTRA_EXECS = dmerror fill2attr fill2fs fill2fs_check scaleread.sh \
diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb b/meta-filesystems/recipes-utils/xfstests/xfstests_2024.01.14.bb
index 4e8e318409..e644272a51 100644
--- a/meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb
+++ b/meta-filesystems/recipes-utils/xfstests/xfstests_2024.01.14.bb
@@ -7,12 +7,11 @@ SRCREV_FORMAT = "xfstests_unionmount"
 
 SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=for-next;name=xfstests \
            git://github.com/amir73il/unionmount-testsuite.git;branch=master;protocol=https;name=unionmount;destsuffix=unionmount-testsuite \
-           file://0001-ltp-fsx.h-Explicitly-use-int-for-return-type-for-aio.patch \
            file://0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch \
            file://0001-add-missing-FTW_-macros-when-not-available-in-libc.patch \
            "
 
-SRCREV_xfstests = "f7765774a1b5cb98c2f21a892e82b3421f40e791"
+SRCREV_xfstests = "c46ca4d1f6c0c45f9a3ea18bc31ba5ae89e02c70"
 SRCREV_unionmount = "e3825b16b46f4c4574a1a69909944c059835f914"
 
 S = "${WORKDIR}/git"