glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xlat: merge fcntl64cmds into fcntlcmds

Browse Source 
Since we don't have to workaround old F_[GS]ETOWN_EX == F_[SG]ETLK64
kernel bug any longer, there is a room for cleanup.

* xlat/fcntlcmds.in (F_GETLK64, F_SETLK64, F_SETLKW64): Add from
xlat/fcntl64cmds.in.
* xlat/fcntl64cmds.in: Remove.
* fcntl.c: Do not include "xlat/fcntl64cmds.h".
(SYS_FUNC(fcntl), SYS_FUNC(fcntl64)): Do not use fcntl64cmds, call
printxval instead of printxvals.
This commit is contained in:
Дмитрий Левин 2018-05-02 15:23:46 +00:00
parent 3f6e47c7cc
commit e1499151e9
3 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fcntl.c
View File

@ -35,7 +35,6 @@
#include "xlat/f_owner_types.h"
#include "xlat/f_seals.h"
#include "xlat/fcntlcmds.h"
#include "xlat/fcntl64cmds.h"
#include "xlat/fdflags.h"
#include "xlat/lockfcmds.h"
#include "xlat/notifyflags.h"
@ -197,14 +196,7 @@ SYS_FUNC(fcntl)
if (entering(tcp)) {
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
const unsigned int cmd = tcp->u_arg[1];
/*
* fcntl syscall does not recognize fcntl64 command constants,
* but we would like to show them for better debugging
* experience.
*/
printxvals(cmd, "F_???", fcntlcmds, fcntl64cmds, NULL);
printxval(fcntlcmds, tcp->u_arg[1], "F_???");
}
return print_fcntl(tcp);
}
@ -215,7 +207,7 @@ SYS_FUNC(fcntl64)
if (entering(tcp)) {
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
printxvals(cmd, "F_???", fcntl64cmds, fcntlcmds, NULL);
printxval(fcntlcmds, cmd, "F_???");
}
switch (cmd) {
case F_SETLK64:

14
xlat/fcntl64cmds.in
View File

@ -1,14 +0,0 @@
/* asm-generic/fcntl.h */
#if defined __hppa__
F_GETLK64 8
F_SETLK64 9
F_SETLKW64 10
#elif defined __mips__
F_GETLK64 33
F_SETLK64 34
F_SETLKW64 35
#else
F_GETLK64 12
F_SETLK64 13
F_SETLKW64 14
#endif

14
xlat/fcntlcmds.in
View File

@ -46,6 +46,20 @@ F_SETSIG 10
F_GETSIG 11
#endif
#if defined __hppa__
F_GETLK64 8
F_SETLK64 9
F_SETLKW64 10
#elif defined __mips__
F_GETLK64 33
F_SETLK64 34
F_SETLKW64 35
#else
F_GETLK64 12
F_SETLK64 13
F_SETLKW64 14
#endif
#ifndef STRACE_WORKAROUND_FOR_F_OWNER_EX
# define STRACE_WORKAROUND_FOR_F_OWNER_EX
/*