mips n32: fix preadv/pwritev offset decoding

[strace] / fanotify.c

diff --git a/fanotify.c b/fanotify.c
index 32a366750cb32027c35f04ca89c1e8012fe6724e..63816b8d3e9a5b15fd09e468b87f73d91f7c223f 100644 (file)
--- a/fanotify.c
+++ b/fanotify.c
@@ -1,9 +1,15 @@
 #include "defs.h"
-#include <linux/fanotify.h>
 
 #include "xlat/fan_classes.h"
 #include "xlat/fan_init_flags.h"
 
+#ifndef FAN_ALL_CLASS_BITS
+# define FAN_ALL_CLASS_BITS (FAN_CLASS_NOTIF | FAN_CLASS_CONTENT | FAN_CLASS_PRE_CONTENT)
+#endif
+#ifndef FAN_NOFD
+# define FAN_NOFD -1
+#endif
+
 int
 sys_fanotify_init(struct tcb *tcp)
 {
@@ -31,6 +37,9 @@ sys_fanotify_init(struct tcb *tcp)
 int
 sys_fanotify_mark(struct tcb *tcp)
 {
+       unsigned long long mask = 0;
+       int argn;
+
        if (exiting(tcp))
                return 0;
 
@@ -38,13 +47,22 @@ sys_fanotify_mark(struct tcb *tcp)
        tprints(", ");
        printflags(fan_mark_flags, (unsigned) tcp->u_arg[1], "FAN_MARK_???");
        tprints(", ");
-       printflags(fan_event_flags, tcp->u_arg[2], "FAN_???");
+       /*
+        * the mask argument is defined as 64-bit,
+        * but kernel uses the lower 32 bits only.
+        */
+       argn = getllval(tcp, &mask, 2);
+#ifdef HPPA
+       /* Parsic is weird.  See arch/parisc/kernel/sys_parisc32.c.  */
+       mask = (mask << 32) | (mask >> 32);
+#endif
+       printflags(fan_event_flags, mask, "FAN_???");
        tprints(", ");
-       if ((int) tcp->u_arg[3] == FAN_NOFD)
+       if ((int) tcp->u_arg[argn] == FAN_NOFD)
                tprints("FAN_NOFD, ");
        else
-               print_dirfd(tcp, tcp->u_arg[3]);
-       printpath(tcp, tcp->u_arg[4]);
+               print_dirfd(tcp, tcp->u_arg[argn]);
+       printpath(tcp, tcp->u_arg[argn + 1]);
 
        return 0;
 }