diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-14 19:22:59 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-14 19:22:59 +0000 |
commit | 95e98c113b1682d9f251295a37306c3bf0d5e8f7 (patch) | |
tree | cf4e326f631c14412d1145c09ff7bdbb60a7be8f /debian/patches/upstream/lsns-tolerate-lsns_ioctl-fd-NS_GET_-PARENT-USERNS-failing.patch | |
parent | Merging upstream version 2.40.1. (diff) | |
download | util-linux-95e98c113b1682d9f251295a37306c3bf0d5e8f7.tar.xz util-linux-95e98c113b1682d9f251295a37306c3bf0d5e8f7.zip |
Adding debian version 2.40.1-1.debian/2.40.1-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/upstream/lsns-tolerate-lsns_ioctl-fd-NS_GET_-PARENT-USERNS-failing.patch')
-rw-r--r-- | debian/patches/upstream/lsns-tolerate-lsns_ioctl-fd-NS_GET_-PARENT-USERNS-failing.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/debian/patches/upstream/lsns-tolerate-lsns_ioctl-fd-NS_GET_-PARENT-USERNS-failing.patch b/debian/patches/upstream/lsns-tolerate-lsns_ioctl-fd-NS_GET_-PARENT-USERNS-failing.patch deleted file mode 100644 index ff17dc2..0000000 --- a/debian/patches/upstream/lsns-tolerate-lsns_ioctl-fd-NS_GET_-PARENT-USERNS-failing.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Masatake YAMATO <yamato@redhat.com> -Date: Sun, 14 Apr 2024 01:40:14 +0900 -Subject: lsns: tolerate lsns_ioctl(fd, - NS_GET_{PARENT,USERNS}) failing with ENOSYS - -With the original code, "lsns/filedesc" test case failed on -"build (qemu-user, s390x)" and "build (qemu-user, riscv64)". - -On the platforms, lsns_ioctl(fd, NS_GET_{PARENT,USERNS}) failed -with ENOSYS. The error stoped the iteration for gathering -information from /proc/[0-9]+. As a result, lsns printed -nothing. We don't expect this behavior. - -Signed-off-by: Masatake YAMATO <yamato@redhat.com> -(cherry picked from commit f2a8b20d9c63f771d1fddd639ea1ec3fe034dc6d) ---- - sys-utils/lsns.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c -index 1f3574f..4ea01d2 100644 ---- a/sys-utils/lsns.c -+++ b/sys-utils/lsns.c -@@ -308,7 +308,11 @@ static int get_ns_ino(int dir, const char *nsname, ino_t *ino, ino_t *pino, ino_ - return -errno; - if (strcmp(nsname, "pid") == 0 || strcmp(nsname, "user") == 0) { - if ((pfd = lsns_ioctl(fd, NS_GET_PARENT)) < 0) { -- if (errno == EPERM) -+ if (errno == EPERM -+ /* On the test platforms, "build (qemu-user, s390x)" and -+ * "build (qemu-user, riscv64)", the ioctl reported ENOSYS. -+ */ -+ || errno == ENOSYS) - goto user; - close(fd); - return -errno; -@@ -323,7 +327,11 @@ static int get_ns_ino(int dir, const char *nsname, ino_t *ino, ino_t *pino, ino_ - } - user: - if ((ofd = lsns_ioctl(fd, NS_GET_USERNS)) < 0) { -- if (errno == EPERM) -+ if (errno == EPERM -+ /* On the test platforms, "build (qemu-user, s390x)" and -+ * "build (qemu-user, riscv64)", the ioctl reported ENOSYS. -+ */ -+ || errno == ENOSYS) - goto out; - close(fd); - return -errno; |