LU-3354 kernel: Kernel update [RHEL6.4 2.6.32-358.6.2.el6]

[fs/lustre-release.git] / libsysio / tests / test_unlink.c

diff --git a/libsysio/tests/test_unlink.c b/libsysio/tests/test_unlink.c
index 9d019d5..3b02a9f 100644 (file)
--- a/libsysio/tests/test_unlink.c
+++ b/libsysio/tests/test_unlink.c
@@ -44,21 +44,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifndef REDSTORM
-#include <getopt.h>
-#else
 #include <unistd.h>
-#endif
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/queue.h>
 #if 0
 #include <dirent.h>
 #endif
+#include <sys/uio.h>
+#include <getopt.h>
 
+#if defined(SYSIO_LABEL_NAMES)
 #include "sysio.h"
-#include "mount.h"
-
+#endif
+#include "xtio.h"
 #include "test.h"
 
 /*
@@ -138,7 +136,7 @@ main(int argc, char *const argv[])
        /*
         * Clean up.
         */
-       _sysio_shutdown();
+       _test_sysio_shutdown();
 
        return 0;
 }
@@ -147,7 +145,7 @@ static int
 unlinkit(const char *path)
 {
 
-       if (unlink(path) != 0) {
+       if (SYSIO_INTERFACE_NAME(unlink)(path) != 0) {
                perror(path);
                return -1;
        }