diff options
author | Changqing Li <changqing.li@windriver.com> | 2022-08-16 10:56:52 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2022-08-16 11:47:31 -0700 |
commit | acdf9bafb0c7f19b58bf6627b02e59e67f80764a (patch) | |
tree | b9c40a851e9ea4e36f796f6ffa53cd899830660d | |
parent | 0609aa408b174e34ff4f5a43abd3b0e0995946c2 (diff) | |
download | meta-openembedded-acdf9bafb0c7f19b58bf6627b02e59e67f80764a.tar.gz |
fuse3: fix ptest test_passthrough_hp failure
fix test_passthrough_hp failure with error:
21 unlinked testfile checks failed
Signed-off-by: Changqing Li <changqing.li@windriver.com>
-rw-r--r-- | meta-filesystems/recipes-support/fuse/fuse3/0001-test-test_syscalls.c-allow-EBADF-in-fcheck_stat-631.patch | 45 | ||||
-rw-r--r-- | meta-filesystems/recipes-support/fuse/fuse3_3.10.5.bb | 1 |
2 files changed, 46 insertions, 0 deletions
diff --git a/meta-filesystems/recipes-support/fuse/fuse3/0001-test-test_syscalls.c-allow-EBADF-in-fcheck_stat-631.patch b/meta-filesystems/recipes-support/fuse/fuse3/0001-test-test_syscalls.c-allow-EBADF-in-fcheck_stat-631.patch new file mode 100644 index 0000000000..2207408bd2 --- /dev/null +++ b/meta-filesystems/recipes-support/fuse/fuse3/0001-test-test_syscalls.c-allow-EBADF-in-fcheck_stat-631.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From cee6de8d6619aeeb70f3318dfd35f2fdf5e43848 Mon Sep 17 00:00:00 2001 | ||
2 | From: Luis Henriques <luis-henrix@users.noreply.github.com> | ||
3 | Date: Sat, 20 Nov 2021 10:09:25 +0000 | ||
4 | Subject: [PATCH] test/test_syscalls.c: allow EBADF in fcheck_stat() (#631) | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Test test/test_examples.py::test_passthrough_hp[False] fails because, on | ||
10 | kernels >= 5.14, fstat() will return -EBADF: | ||
11 | |||
12 | 3 [check_unlinked_testfile] fcheck_stat() - fstat: Bad file descriptor | ||
13 | 4 [check_unlinked_testfile] fcheck_stat() - fstat: Bad file descriptor | ||
14 | 5 [check_unlinked_testfile] fcheck_stat() - fstat: Bad file descriptor | ||
15 | 9 [check_unlinked_testfile] fcheck_stat() - fstat: Bad file descriptor | ||
16 | ... | ||
17 | |||
18 | This patch simply whitelists the EBADF errno code. | ||
19 | |||
20 | Signed-off-by: Luís Henriques <lhenriques@suse.de> | ||
21 | Co-authored-by: Luís Henriques <lhenriques@suse.de> | ||
22 | |||
23 | Upstream-Status: Backport [https://github.com/libfuse/libfuse/commit/cee6de8d6619aeeb70f3318dfd35f2fdf5e43848] | ||
24 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
25 | --- | ||
26 | test/test_syscalls.c | 3 ++- | ||
27 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
28 | |||
29 | diff --git a/test/test_syscalls.c b/test/test_syscalls.c | ||
30 | index 160a2ac..65292ed 100644 | ||
31 | --- a/test/test_syscalls.c | ||
32 | +++ b/test/test_syscalls.c | ||
33 | @@ -277,7 +277,8 @@ static int fcheck_stat(int fd, int flags, struct stat *st) | ||
34 | if (flags & O_PATH) { | ||
35 | // With O_PATH fd, the server does not have to keep | ||
36 | // the inode alive so FUSE inode may be stale or bad | ||
37 | - if (errno == ESTALE || errno == EIO || errno == ENOENT) | ||
38 | + if (errno == ESTALE || errno == EIO || | ||
39 | + errno == ENOENT || errno == EBADF) | ||
40 | return 0; | ||
41 | } | ||
42 | PERROR("fstat"); | ||
43 | -- | ||
44 | 2.25.1 | ||
45 | |||
diff --git a/meta-filesystems/recipes-support/fuse/fuse3_3.10.5.bb b/meta-filesystems/recipes-support/fuse/fuse3_3.10.5.bb index 8b0d8ecab8..0f379afb92 100644 --- a/meta-filesystems/recipes-support/fuse/fuse3_3.10.5.bb +++ b/meta-filesystems/recipes-support/fuse/fuse3_3.10.5.bb | |||
@@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://GPL2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | |||
12 | file://LICENSE;md5=a55c12a2d7d742ecb41ca9ae0a6ddc66" | 12 | file://LICENSE;md5=a55c12a2d7d742ecb41ca9ae0a6ddc66" |
13 | 13 | ||
14 | SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz \ | 14 | SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz \ |
15 | file://0001-test-test_syscalls.c-allow-EBADF-in-fcheck_stat-631.patch \ | ||
15 | " | 16 | " |
16 | SRC_URI[sha256sum] = "b2e283485d47404ac896dd0bb7f7ba81e1470838e677e45f659804c3a3b69666" | 17 | SRC_URI[sha256sum] = "b2e283485d47404ac896dd0bb7f7ba81e1470838e677e45f659804c3a3b69666" |
17 | 18 | ||