| Message ID | 20200120133646.8629-2-pvorel@suse.cz |
|---|---|
| State | Accepted |
| Delegated to: | Petr Vorel |
| Headers | show |
| Series | [1/2] socketcall01: Use tst_syscall() instead of custom syscall support detection | expand |
Hi, ... > -static inline int tst_dev_sync(int fd) > -{ > - return syscall(__NR_syncfs, fd); > -} > +static int tst_dev_sync(int fd); This is obviously wrong. > diff --git a/lib/tst_device.c b/lib/tst_device.c ... > +static int tst_dev_sync(int fd) And here as well. > +{ > + return syscall(__NR_syncfs, fd); > +} Sorry for wrong patch. Kind regards, Petr
Hi!
> Sorry for wrong patch.
Besides of that we need either of the two patches to fix the problem,
now I do wonder which one should we apply before the release.
I guess that moving the function to the library code is a bit more
conservative move after all, so we may as well apply that and fix the
socketcall test after the release.
Hi, > Besides of that we need either of the two patches to fix the problem, > now I do wonder which one should we apply before the release. > I guess that moving the function to the library code is a bit more > conservative move after all, so we may as well apply that and fix the > socketcall test after the release. +1. Kind regards, Petr
diff --git a/include/tst_device.h b/include/tst_device.h index 13d92ee54..64ea77768 100644 --- a/include/tst_device.h +++ b/include/tst_device.h @@ -19,7 +19,6 @@ #define TST_DEVICE_H__ #include <unistd.h> -#include "lapi/syscalls.h" struct tst_device { const char *dev; @@ -76,10 +75,7 @@ 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 int tst_dev_sync(int fd) -{ - return syscall(__NR_syncfs, fd); -} +static int tst_dev_sync(int fd); /* * Reads test block device stat file and returns the bytes written since the diff --git a/lib/tst_device.c b/lib/tst_device.c index e78549c94..ade6fdd52 100644 --- a/lib/tst_device.c +++ b/lib/tst_device.c @@ -31,6 +31,7 @@ #include <linux/loop.h> #include <stdint.h> #include <inttypes.h> +#include "lapi/syscalls.h" #include "test.h" #include "safe_macros.h" @@ -222,6 +223,11 @@ int tst_detach_device(const char *dev) return 1; } +static int tst_dev_sync(int fd) +{ + return syscall(__NR_syncfs, fd); +} + const char *tst_acquire_device__(unsigned int size) { int fd;
While socketcall01.c was already fixed by previous commit and we expect nothing else was broken by 9e83513eb, it's still better not include lapi/syscalls.h to everything which uses new C API. Fixes: 9e83513eb "tst_device.h: Use lapi/syscalls.h instead of <sys/syscall.h>" Suggested-by: Martin Doucha <mdoucha@suse.cz> Signed-off-by: Petr Vorel <pvorel@suse.cz> --- Feel free to reject this one. Kind regards, Petr include/tst_device.h | 6 +----- lib/tst_device.c | 6 ++++++ 2 files changed, 7 insertions(+), 5 deletions(-)