summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ltp/ltp/0040-containers-userns05-use-unsigned-int-for-ns-id.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/ltp/ltp/0040-containers-userns05-use-unsigned-int-for-ns-id.patch')
-rw-r--r--meta/recipes-extended/ltp/ltp/0040-containers-userns05-use-unsigned-int-for-ns-id.patch60
1 files changed, 0 insertions, 60 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0040-containers-userns05-use-unsigned-int-for-ns-id.patch b/meta/recipes-extended/ltp/ltp/0040-containers-userns05-use-unsigned-int-for-ns-id.patch
deleted file mode 100644
index 4dee1f5a9b..0000000000
--- a/meta/recipes-extended/ltp/ltp/0040-containers-userns05-use-unsigned-int-for-ns-id.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 3b63d350e9fe9e4271916cc0abfac65a5d6419ff Mon Sep 17 00:00:00 2001
-From: Jiri Jaburek <jjaburek@redhat.com>
-Date: Tue, 7 Feb 2017 07:58:16 +0000
-Subject: [PATCH] containers/userns05: use unsigned int for ns id
-
-The kernel defines it as 'unsigned int' in 'struct ns_common'
-and formats it as
-
- snprintf(buf, size, "%s:[%u]", ns_ops->name, ns->inum);
-
-This change makes the test work on 32bit systems where LONG_MAX
-is smaller than UINT_MAX.
-
-Signed-off-by: Jiri Jaburek <jjaburek@redhat.com>
-
-Upstream-Status: Backport
-
-Signed-off-by: He Zhe <zhe.he@windriver.com>
----
- testcases/kernel/containers/userns/userns05.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/testcases/kernel/containers/userns/userns05.c b/testcases/kernel/containers/userns/userns05.c
-index 8d8c40a..8eac729 100644
---- a/testcases/kernel/containers/userns/userns05.c
-+++ b/testcases/kernel/containers/userns/userns05.c
-@@ -49,18 +49,18 @@ static int child_fn1(void)
- return 0;
- }
-
--static long getusernsidbypid(int pid)
-+static unsigned int getusernsidbypid(int pid)
- {
- char path[BUFSIZ];
- char userid[BUFSIZ];
-- long id = 0;
-+ unsigned int id = 0;
-
- sprintf(path, "/proc/%d/ns/user", pid);
-
- if (readlink(path, userid, BUFSIZ) == -1)
- tst_resm(TFAIL | TERRNO, "readlink failure.");
-
-- if (sscanf(userid, "user:[%ld]", &id) != 1)
-+ if (sscanf(userid, "user:[%u]", &id) != 1)
- tst_resm(TFAIL, "sscanf failure.");
- return id;
- }
-@@ -68,7 +68,7 @@ static long getusernsidbypid(int pid)
- static void test_userns_id(void)
- {
- int cpid1, cpid2, cpid3;
-- long parentuserns, cpid1userns, cpid2userns, newparentuserns;
-+ unsigned int parentuserns, cpid1userns, cpid2userns, newparentuserns;
-
- parentuserns = getusernsidbypid(getpid());
- cpid1 = ltp_clone_quick(SIGCHLD, (void *)child_fn1,
---
-2.9.3
-