[LTP] [PATCH V2] userns02: add SAFE_CLOSE

[Yuan Sun]

Signed-off-by: Yuan Sun <sunyu...@huawei.com>
---
 testcases/kernel/containers/userns/userns02.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/testcases/kernel/containers/userns/userns02.c 
b/testcases/kernel/containers/userns/userns02.c
index ad5dda5..3bcb97d 100644
--- a/testcases/kernel/containers/userns/userns02.c
+++ b/testcases/kernel/containers/userns/userns02.c
@@ -31,6 +31,11 @@
 char *TCID = "user_namespace2";
 int TST_TOTAL = 1;
 
+static void cleanup(void)
+{
+       tst_rmdir();
+}
+
 /*
  * child_fn1() - Inside a new user namespace
  */
@@ -62,11 +67,6 @@ static void setup(void)
        TST_CHECKPOINT_INIT(NULL);
 }
 
-static void cleanup(void)
-{
-       tst_rmdir();
-}
-
 int main(int argc, char *argv[])
 {
        int status;
@@ -93,14 +93,16 @@ int main(int argc, char *argv[])
                parentgid = getegid();
                sprintf(path, "/proc/%d/uid_map", childpid);
                sprintf(content, "100 %d 1", parentuid);
-               fd = SAFE_OPEN(NULL, path, O_WRONLY, 0644);
-               SAFE_WRITE(NULL, 1, fd, content, strlen(content));
+               fd = SAFE_OPEN(cleanup, path, O_WRONLY, 0644);
+               SAFE_WRITE(cleanup, 1, fd, content, strlen(content));
+               SAFE_CLOSE(cleanup, fd);
                sprintf(path, "/proc/%d/gid_map", childpid);
                sprintf(content, "100 %d 1", parentgid);
-               fd = SAFE_OPEN(NULL, path, O_WRONLY, 0644);
-               SAFE_WRITE(NULL, 1, fd, content, strlen(content));
+               fd = SAFE_OPEN(cleanup, path, O_WRONLY, 0644);
+               SAFE_WRITE(cleanup, 1, fd, content, strlen(content));
+               SAFE_CLOSE(cleanup, fd);
 
-               TST_SAFE_CHECKPOINT_WAKE(NULL, 0);
+               TST_SAFE_CHECKPOINT_WAKE(cleanup, 0);
 
                if (waitpid(childpid, &status, 0) < 0)
                        tst_brkm(TBROK | TERRNO, cleanup, "waitpid failed");
-- 
1.9.1


------------------------------------------------------------------------------
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list