diff options
author | Xiao Yang <yangx.jy@cn.fujitsu.com> | 2018-05-21 13:42:00 +0800 |
---|---|---|
committer | Eryu Guan <guaneryu@gmail.com> | 2018-05-26 16:59:16 +0800 |
commit | 69b7f3c4f7203ba8efe08c0408cab157f544f39b (patch) | |
tree | dfd2e108ce261d5b17cb243d7a818a25dc877526 | |
parent | 8ee4d87d341994f95e96321dd56f0b25b549c0cb (diff) | |
download | xfstests-dev-69b7f3c4f7203ba8efe08c0408cab157f544f39b.tar.gz |
generic/484: Need another process to check record locks
According to fcntl(2) manpage, A single process always gets F_UNLCK
in the l_type field when using fcntl(F_GETLK) to acquire the
existing lock set by itself because it could convert the existing
lock to a new lock unconditionally. So we need another process to
check if the lock exists.
Also remove redundant exit(0).
Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
Reviewed-by: Xiong Zhou <xzhou@redhat.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
-rw-r--r-- | src/t_locks_execve.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/t_locks_execve.c b/src/t_locks_execve.c index 9ad2dc370d..d99d7de701 100644 --- a/src/t_locks_execve.c +++ b/src/t_locks_execve.c @@ -8,6 +8,7 @@ #include <errno.h> #include <pthread.h> #include <unistd.h> +#include <sys/types.h> #include <sys/wait.h> static void err_exit(char *op, int errn) @@ -32,12 +33,24 @@ struct flock fl = { static void checklock(int fd) { - if (fcntl(fd, F_GETLK, &fl) < 0) - err_exit("getlk", errno); - if (fl.l_type == F_UNLCK) { - printf("record lock is not preserved across execve(2)\n"); - exit(1); + pid_t pid; + + pid = fork(); + if (pid < 0) + err_exit("fork", errno); + + if (!pid) { + if (fcntl(fd, F_GETLK, &fl) < 0) + err_exit("getlk", errno); + if (fl.l_type == F_UNLCK) { + printf("record lock is not preserved across execve(2)\n"); + exit(1); + } + exit(0); } + + waitpid(pid, NULL, 0); + exit(0); } @@ -52,7 +65,6 @@ int main(int argc, char **argv) if (argc == 3) { fd = atoi(argv[2]); checklock(fd); - exit(0); } fd = open(argv[1], O_WRONLY|O_CREAT, 0755); |