netlink_sock_diag: print inet_diag_sockid.idiag_if as an interface index

[strace] / file_ioctl.c

diff --git a/file_ioctl.c b/file_ioctl.c
index de8101937b3058745a8dcfb35d80fb9eaf06e9c2..cc2378f63d1826b686f469516cc9d517f20eec09 100644 (file)
--- a/file_ioctl.c
+++ b/file_ioctl.c
@@ -36,11 +36,11 @@
 #endif
 
 #ifndef FICLONE
-# define FICLONE         _IOW(0x94, 9, int)
+# define FICLONE       _IOW(0x94, 9, int)
 #endif
 
 #ifndef FICLONERANGE
-# define FICLONERANGE    _IOW(0x94, 13, struct file_clone_range)
+# define FICLONERANGE  _IOW(0x94, 13, struct file_clone_range)
 struct file_clone_range {
        int64_t src_fd;
        uint64_t src_offset;
@@ -50,7 +50,7 @@ struct file_clone_range {
 #endif
 
 #ifndef FIDEDUPERANGE
-# define FIDEDUPERANGE   _IOWR(0x94, 54, struct file_dedupe_range)
+# define FIDEDUPERANGE _IOWR(0x94, 54, struct file_dedupe_range)
 struct file_dedupe_range_info {
        int64_t dest_fd;        /* in - destination file */
        uint64_t dest_offset;   /* in - start of extent in destination */
@@ -123,7 +123,8 @@ print_fiemap_extent(struct tcb *tcp, void *elem_buf, size_t elem_size, void *dat
 #endif /* HAVE_LINUX_FIEMAP_H */
 
 int
-file_ioctl(struct tcb *tcp, const unsigned int code, const long arg)
+file_ioctl(struct tcb *const tcp, const unsigned int code,
+          const kernel_ulong_t arg)
 {
        switch (code) {
        case FICLONE:   /* W */