This adds binary utility and common script of syncfs for the actual test scripts.
Signed-off-by: Chengguang Xu <cgxu@xxxxxxxxxxxx>
---
.gitignore | 1 +
common/syncfs | 33 +++++++++++++++++++++++++++
configure.ac | 1 +
src/Makefile | 2 +-
src/syncfs.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 108 insertions(+), 1 deletion(-)
create mode 100644 common/syncfs
create mode 100644 src/syncfs.c
diff --git a/.gitignore b/.gitignore
index f27c30a..54f010c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -142,6 +142,7 @@
/src/writemod
/src/writev_on_pagefault
/src/xfsctl
+/src/syncfs
/src/aio-dio-regress/aio-dio-append-write-read-race
/src/aio-dio-regress/aio-dio-cow-race
/src/aio-dio-regress/aio-dio-cycle-write
diff --git a/common/syncfs b/common/syncfs
new file mode 100644
index 0000000..125ee4c
--- /dev/null
+++ b/common/syncfs
@@ -0,0 +1,33 @@
+######
+#
+# syncfs helpers
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2017 Chengguang Xu <cgxu@xxxxxxxxxxxx>.
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#-----------------------------------------------------------------------
+
+# This checks whether the syncfs syscall is supported.
+_requires_syncfs()
+{
+ if test ! -x src/syncfs; then
+ _notrun "syncfs binary not found"
+ fi
+
+ if ! src/syncfs $TEST_DIR; then
+ _notrun "kernel doesn't support syncfs syscall"
+ fi
+}
diff --git a/configure.ac b/configure.ac
index 57092f1..7207a47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,7 @@ AC_PACKAGE_WANT_LINUX_PRCTL_H
AC_PACKAGE_WANT_LINUX_FS_H
AC_CHECK_FUNCS([renameat2])
+AC_CHECK_FUNCS([syncfs])
AC_CONFIG_HEADER(include/config.h)
AC_CONFIG_FILES([include/builddefs])
diff --git a/src/Makefile b/src/Makefile
index b101217..83451a9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -23,7 +23,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \
seek_copy_test t_readdir_1 t_readdir_2 fsync-tester nsexec cloner \
renameat2 t_getcwd e4compact test-nextquota punch-alternating \
attr-list-by-handle-cursor-test listxattr dio-interleaved t_dir_type \
- dio-invalidate-cache stat_test t_encrypted_d_revalidate
+ dio-invalidate-cache stat_test t_encrypted_d_revalidate syncfs
SUBDIRS = log-writes perf
diff --git a/src/syncfs.c b/src/syncfs.c
new file mode 100644
index 0000000..d30a3e6
--- /dev/null
+++ b/src/syncfs.c
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2017, Chengguang Xu <cgxu@xxxxxxxxxxxx>
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/* This is a trivial wrapper around the syncfs syscall. */
+
+#include "global.h"
+
+#ifndef HAVE_SYNCFS
+#include <sys/syscall.h>
+
+#if !defined(SYS_syncfs) && defined(__x86_64__)
+#define SYS_syncfs 306
+#endif /* !defined(SYS_syncfs) && defined(__x86_64__) */
+
+#if !defined(SYS_syncfs) && defined(__i386__)
+#define SYS_syncfs 344
+#endif /* !defined(SYS_syncfs) && defined(__i386__) */
+
+static int syncfs(int fd)
+{
+#ifdef SYS_syncfs
+ return syscall(SYS_syncfs, fd);
+#else
+ errno = ENOSYS;
+ return -1;
+#endif /* SYS_syncfs */
+}
+#endif /* HAVE_SYNCFS */
+
+int main(int argc, char **argv)
+{
+ int fd, ret;
+ const char *fpath = NULL;
+
+ if (argc != 2)
+ goto usage;
+
+ fpath = argv[1];
+ fd = open(fpath, O_RDONLY);
+ if (fd < 0) {
+ perror("");
+ return 1;
+ }
+
+ ret = syncfs(fd);
+ if (ret == -1 && errno == ENOSYS)
+ ret = 1;
+ else
+ ret = 0;
+
+ close(fd);
+ return ret;
+
+usage:
+ fprintf(stderr, "usage: %s path\n", argv[0]);
+ return 1;
+}
--
1.8.3.1
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
