* [LTP] [PATCH 1/1] tst_device: use raw syscall in the tst_device.h
@ 2020-01-10 15:14 Petr Vorel
2020-01-10 15:26 ` Cyril Hrubis
2020-01-11 16:08 ` Li Wang
0 siblings, 2 replies; 7+ messages in thread
From: Petr Vorel @ 2020-01-10 15:14 UTC (permalink / raw)
To: ltp
From: Li Wang <liwang@redhat.com>
To follow up commit 447c223db ("tst_device: include unistd.h").
Reported-by: Petr Vorel <pvorel@suse.cz>
Suggested-by: Cyril Hrubis <chrubis@suse.cz>
Signed-off-by: Li Wang <liwang@redhat.com>
Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
[pvorel: Removed _XOPEN_SOURCE from affected tests to really fix
the issue and aren't needed]
Reviewed-by: Petr Vorel <pvorel@suse.cz>
Tested-by: Petr Vorel <pvorel@suse.cz>
Fixes: eca0fa3c3 ("tst_device: add new tst_dev_sync")
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
Hi,
tested on
https://travis-ci.org/pevik/ltp/builds/635305638
Please anybody ack and merge, so we can move on with merging other
things before git freeze.
NOTE: Debian failures are caused by bug in libtirpc 1.2.5,
will be fixed by https://patchwork.ozlabs.org/patch/1216506/
Kind regards,
Petr
include/tst_device.h | 5 +++--
testcases/kernel/syscalls/fadvise/posix_fadvise01.c | 1 -
testcases/kernel/syscalls/fadvise/posix_fadvise02.c | 1 -
testcases/kernel/syscalls/fadvise/posix_fadvise03.c | 1 -
testcases/kernel/syscalls/fadvise/posix_fadvise04.c | 1 -
testcases/kernel/syscalls/pwrite/pwrite02.c | 2 --
6 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/include/tst_device.h b/include/tst_device.h
index f277afd77..3db5275c9 100644
--- a/include/tst_device.h
+++ b/include/tst_device.h
@@ -19,6 +19,7 @@
#define TST_DEVICE_H__
#include <unistd.h>
+#include <sys/syscall.h>
struct tst_device {
const char *dev;
@@ -75,9 +76,9 @@ int tst_detach_device(const char *dev_path);
* simply before the tst_dev_bytes_written invocation. For easy to use,
* we create this inline function tst_dev_sync.
*/
-static inline void tst_dev_sync(int fd)
+static inline int tst_dev_sync(int fd)
{
- syncfs(fd);
+ return syscall(__NR_syncfs, fd);
}
/*
diff --git a/testcases/kernel/syscalls/fadvise/posix_fadvise01.c b/testcases/kernel/syscalls/fadvise/posix_fadvise01.c
index 2af040840..71e6454d8 100644
--- a/testcases/kernel/syscalls/fadvise/posix_fadvise01.c
+++ b/testcases/kernel/syscalls/fadvise/posix_fadvise01.c
@@ -20,7 +20,6 @@
* None
*/
-#define _XOPEN_SOURCE 600
#include <fcntl.h>
#include <unistd.h>
diff --git a/testcases/kernel/syscalls/fadvise/posix_fadvise02.c b/testcases/kernel/syscalls/fadvise/posix_fadvise02.c
index d533a7953..303f776e4 100644
--- a/testcases/kernel/syscalls/fadvise/posix_fadvise02.c
+++ b/testcases/kernel/syscalls/fadvise/posix_fadvise02.c
@@ -20,7 +20,6 @@
* None
*/
-#define _XOPEN_SOURCE 600
#include <fcntl.h>
#include <unistd.h>
#include <signal.h>
diff --git a/testcases/kernel/syscalls/fadvise/posix_fadvise03.c b/testcases/kernel/syscalls/fadvise/posix_fadvise03.c
index 5bada5f3d..98d8d2930 100644
--- a/testcases/kernel/syscalls/fadvise/posix_fadvise03.c
+++ b/testcases/kernel/syscalls/fadvise/posix_fadvise03.c
@@ -20,7 +20,6 @@
* None
*/
-#define _XOPEN_SOURCE 600
#include <fcntl.h>
#include <unistd.h>
#include <signal.h>
diff --git a/testcases/kernel/syscalls/fadvise/posix_fadvise04.c b/testcases/kernel/syscalls/fadvise/posix_fadvise04.c
index d8d8fb601..f389a219b 100644
--- a/testcases/kernel/syscalls/fadvise/posix_fadvise04.c
+++ b/testcases/kernel/syscalls/fadvise/posix_fadvise04.c
@@ -20,7 +20,6 @@
* None
*/
-#define _XOPEN_SOURCE 600
#include <fcntl.h>
#include <unistd.h>
#include <signal.h>
diff --git a/testcases/kernel/syscalls/pwrite/pwrite02.c b/testcases/kernel/syscalls/pwrite/pwrite02.c
index 056d44da2..221904cd7 100644
--- a/testcases/kernel/syscalls/pwrite/pwrite02.c
+++ b/testcases/kernel/syscalls/pwrite/pwrite02.c
@@ -18,8 +18,6 @@
* accessible address space, returns EFAULT.
*/
-#define _XOPEN_SOURCE 500
-
#include <errno.h>
#include <unistd.h>
#include <string.h>
--
2.24.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [LTP] [PATCH 1/1] tst_device: use raw syscall in the tst_device.h
2020-01-10 15:14 [LTP] [PATCH 1/1] tst_device: use raw syscall in the tst_device.h Petr Vorel
@ 2020-01-10 15:26 ` Cyril Hrubis
2020-01-10 15:32 ` Petr Vorel
2020-01-10 15:32 ` Jan Stancek
2020-01-11 16:08 ` Li Wang
1 sibling, 2 replies; 7+ messages in thread
From: Cyril Hrubis @ 2020-01-10 15:26 UTC (permalink / raw)
To: ltp
Hi!
> tested on
> https://travis-ci.org/pevik/ltp/builds/635305638
>
> Please anybody ack and merge, so we can move on with merging other
> things before git freeze.
Acked once and if the travis run finishes green.
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 7+ messages in thread
* [LTP] [PATCH 1/1] tst_device: use raw syscall in the tst_device.h
2020-01-10 15:14 [LTP] [PATCH 1/1] tst_device: use raw syscall in the tst_device.h Petr Vorel
2020-01-10 15:26 ` Cyril Hrubis
@ 2020-01-11 16:08 ` Li Wang
1 sibling, 0 replies; 7+ messages in thread
From: Li Wang @ 2020-01-11 16:08 UTC (permalink / raw)
To: ltp
Thanks Petr for help doing this, I'm on the way to visit Brno. Not
convenient to connect internet until next week.
-- sending by my ph1 phone.
On Fri, Jan 10, 2020, 16:14 Petr Vorel <pvorel@suse.cz> wrote:
> From: Li Wang <liwang@redhat.com>
>
> To follow up commit 447c223db ("tst_device: include unistd.h").
>
> Reported-by: Petr Vorel <pvorel@suse.cz>
> Suggested-by: Cyril Hrubis <chrubis@suse.cz>
> Signed-off-by: Li Wang <liwang@redhat.com>
> Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
> [pvorel: Removed _XOPEN_SOURCE from affected tests to really fix
> the issue and aren't needed]
> Reviewed-by: Petr Vorel <pvorel@suse.cz>
> Tested-by: Petr Vorel <pvorel@suse.cz>
>
> Fixes: eca0fa3c3 ("tst_device: add new tst_dev_sync")
> Signed-off-by: Petr Vorel <pvorel@suse.cz>
> ---
> Hi,
>
> tested on
> https://travis-ci.org/pevik/ltp/builds/635305638
>
> Please anybody ack and merge, so we can move on with merging other
> things before git freeze.
>
> NOTE: Debian failures are caused by bug in libtirpc 1.2.5,
> will be fixed by https://patchwork.ozlabs.org/patch/1216506/
>
> Kind regards,
> Petr
>
> include/tst_device.h | 5 +++--
> testcases/kernel/syscalls/fadvise/posix_fadvise01.c | 1 -
> testcases/kernel/syscalls/fadvise/posix_fadvise02.c | 1 -
> testcases/kernel/syscalls/fadvise/posix_fadvise03.c | 1 -
> testcases/kernel/syscalls/fadvise/posix_fadvise04.c | 1 -
> testcases/kernel/syscalls/pwrite/pwrite02.c | 2 --
> 6 files changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/include/tst_device.h b/include/tst_device.h
> index f277afd77..3db5275c9 100644
> --- a/include/tst_device.h
> +++ b/include/tst_device.h
> @@ -19,6 +19,7 @@
> #define TST_DEVICE_H__
>
> #include <unistd.h>
> +#include <sys/syscall.h>
>
> struct tst_device {
> const char *dev;
> @@ -75,9 +76,9 @@ int tst_detach_device(const char *dev_path);
> * simply before the tst_dev_bytes_written invocation. For easy to use,
> * we create this inline function tst_dev_sync.
> */
> -static inline void tst_dev_sync(int fd)
> +static inline int tst_dev_sync(int fd)
> {
> - syncfs(fd);
> + return syscall(__NR_syncfs, fd);
> }
>
> /*
> diff --git a/testcases/kernel/syscalls/fadvise/posix_fadvise01.c
> b/testcases/kernel/syscalls/fadvise/posix_fadvise01.c
> index 2af040840..71e6454d8 100644
> --- a/testcases/kernel/syscalls/fadvise/posix_fadvise01.c
> +++ b/testcases/kernel/syscalls/fadvise/posix_fadvise01.c
> @@ -20,7 +20,6 @@
> * None
> */
>
> -#define _XOPEN_SOURCE 600
> #include <fcntl.h>
>
> #include <unistd.h>
> diff --git a/testcases/kernel/syscalls/fadvise/posix_fadvise02.c
> b/testcases/kernel/syscalls/fadvise/posix_fadvise02.c
> index d533a7953..303f776e4 100644
> --- a/testcases/kernel/syscalls/fadvise/posix_fadvise02.c
> +++ b/testcases/kernel/syscalls/fadvise/posix_fadvise02.c
> @@ -20,7 +20,6 @@
> * None
> */
>
> -#define _XOPEN_SOURCE 600
> #include <fcntl.h>
> #include <unistd.h>
> #include <signal.h>
> diff --git a/testcases/kernel/syscalls/fadvise/posix_fadvise03.c
> b/testcases/kernel/syscalls/fadvise/posix_fadvise03.c
> index 5bada5f3d..98d8d2930 100644
> --- a/testcases/kernel/syscalls/fadvise/posix_fadvise03.c
> +++ b/testcases/kernel/syscalls/fadvise/posix_fadvise03.c
> @@ -20,7 +20,6 @@
> * None
> */
>
> -#define _XOPEN_SOURCE 600
> #include <fcntl.h>
> #include <unistd.h>
> #include <signal.h>
> diff --git a/testcases/kernel/syscalls/fadvise/posix_fadvise04.c
> b/testcases/kernel/syscalls/fadvise/posix_fadvise04.c
> index d8d8fb601..f389a219b 100644
> --- a/testcases/kernel/syscalls/fadvise/posix_fadvise04.c
> +++ b/testcases/kernel/syscalls/fadvise/posix_fadvise04.c
> @@ -20,7 +20,6 @@
> * None
> */
>
> -#define _XOPEN_SOURCE 600
> #include <fcntl.h>
> #include <unistd.h>
> #include <signal.h>
> diff --git a/testcases/kernel/syscalls/pwrite/pwrite02.c
> b/testcases/kernel/syscalls/pwrite/pwrite02.c
> index 056d44da2..221904cd7 100644
> --- a/testcases/kernel/syscalls/pwrite/pwrite02.c
> +++ b/testcases/kernel/syscalls/pwrite/pwrite02.c
> @@ -18,8 +18,6 @@
> * accessible address space, returns EFAULT.
> */
>
> -#define _XOPEN_SOURCE 500
> -
> #include <errno.h>
> #include <unistd.h>
> #include <string.h>
> --
> 2.24.0
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20200111/f89bbe68/attachment.htm>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-01-11 16:08 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-10 15:14 [LTP] [PATCH 1/1] tst_device: use raw syscall in the tst_device.h Petr Vorel
2020-01-10 15:26 ` Cyril Hrubis
2020-01-10 15:32 ` Petr Vorel
2020-01-10 15:32 ` Jan Stancek
2020-01-10 15:35 ` Petr Vorel
2020-01-10 15:40 ` Jan Stancek
2020-01-11 16:08 ` Li Wang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.