strace/xlat/fsmagic.in
Eugene Syromyatnikov 861f9fd7d8 Add xlat description structure.
Rename struct xlat to struct xlat_data and make struct  xlat an xlat descriptor
that contains various information about xlat. So far, it's type and number
of items.

As a result, xlookup/printxval now have enought information for handling
xlat depending on its type, so no *index/*_search APIs are needed.

* xlat.h (struct xlat_data): Rename from struct xlat.
(struct xlat): New type definition.
* xlat.c (xlat_search, printxval_sized, printxval_searchn_ex, xlat_idx,
printxval_indexn_ex, printxval_dispatch_ex, ): Remove.
(xlookup): Handle xlat_data based on xlat type.
(xlookup_le): New function, replaces xlat_search_eq_or_less and supports
all xlat types.
(sprintflags_ex, printflags_ex): Update.
* xlat/gen.sh (gen_header): Add handling for #sorted, generate new
struct xlat descriptor.
* defs.h (arp_hardware_types_size, ethernet_protocols_size,
inet_protocols_size, evdev_abs_size, xlat_search,
xlat_search_eq_or_less, xlat_idx, printxval_searchn_ex,
printxval_searchn, printxval_search, printxval_search_ex,
printxval_indexn_ex, printxval_indexn, printxval_index,
printxval_index_ex, printxval_dispatch_ex, printxval_dispatch): Remove.
(enum xlat_style_private_flag_bits): Remove PAF_INDEX_XLAT_SORTED_BIT
and PAF_INDEX_XLAT_VALUE_INDEXED_BIT.
(enum xlat_style_private_flag): Remove PAF_INDEX_XLAT_SORTED and
PAF_INDEX_XLAT_VALUE_INDEXED.
(print_array_ex): Remove index_xlat_size argument.
(xlookup_le): New declaration.
(printxval_ex): New macro.
* dyxlat.c (struct dyxlat): Remove used field (use xlat.size instead),
embed struct xlat, add pointer to struct xlat_data.
(MARK_END): Remove.
(dyxlat_alloc, dyxlat_free, dyxlat_get, dyxlat_add_pair): Update in
accordance with the structure changes.
* evdev.c (evdev_abs_size): Remove.
(keycode_ioctl): Use printxval instead of printxval_index.
(decode_bitset): Remove.
(decode_bitset_): Rename to decode_bitset, remove decode_nr_size and xt
arguments, call printxval instead of printxval_dispatch.
(bit_ioctl, evdev_read_ioctl): Do not pass xlat type to decode_bitset.
* print_fields.h (PRINT_FIELD_XVAL_SORTED_SIZED,
PRINT_FIELD_XVAL_INDEX): Remove.
* nlattr.h (struct decode_nla_xlat_opts): Remove xlat_size and xt
fields.
* nlattr.c (decode_nla_meminfo): do not pass
PAF_INDEX_XLAT_VALUE_INDEXED flag and netlink_sk_meminfo_indices size
in a print_array_ex call.
(decode_nla_xval): Call printxval_ex instead of printxval_dispatch_ex.
(decode_nla_ether_proto, decode_nla_ip_proto): Do not pass xlat_size and
xt fields in opts.
(decode_nla_flags): Remove XT_INDEXED unsupported warning.
* process.c (struct_user_offsets_data): Rename from
struct_user_offsets, change type to struct xlat_data[], remove XLAT_END.
(struct_user_offsets): New xlat description.
(print_user_offset_addr): Rewrite using xlookup_le.
* util.c (print_array_ex): Remove index_xlat_size argument, simply call
printxval_ex for index printing.
* aio.c (tprint_lio_opcode): Use printxval_ex instead of
printxval_indexn_ex.
* bpf.c: Use printxval instead of printxval_index; use PRINT_FIELD_XVAL
instead of PRINT_FIELD_XVAL_INDEX.
* bpf_filter.c (print_bpf_filter_code): Use printxval instead of
printxval_index.
* ioctl.c (evdev_decode_number): Use printxval instead of
printxval_indexn.
* kvm.c (kvm_ioctl_decode_check_extension): Use printxval instead of
printxval_index.
(kvm_ioctl_run_attach_auxstr): Use xlookup instead of xlat_idx.
* net.c: Use printxval instead of printxval_search/printxval_index, use
printxval_ex instead of printxval_searchn_ex.
* netlink_packet_diag.c (decode_packet_diag_msg): Use PRINT_FIELD_XVAL
instead of PRINT_FIELD_XVAL_SORTED_SIZED.
* netlink_smc_diag.c (decode_smc_diag_shutdown): Remove ARRSZ_PAIR
wrapper.
(decode_smc_diag_fallback): Use printxval_ex instead of
printxval_search_ex.
(decode_smc_diag_msg): Use PRINT_FIELD_XVAL instead of
PRINT_FIELD_XVAL_INDEX.
* print_statfs.c (print_statfs_type): Use printxval instead of
printxval_search.
* rtnl_cachereport.c (decode_nla_ipmra_msg_type,
decode_nla_ip6mra_msg_type): Remove ARRSZ_PAIR wrappers, xt fields.
* rtnl_link.c (decode_ifla_inet6_flags, decode_ifla_inet6_agm):
Likewise.
(decode_nla_tun_type, decode_ifla_xdp_attached): Remove xlat_size,
xt fields.
(decode_ifla_inet_conf, decode_ifla_inet6_conf, decode_ifla_inet6_stats,
decode_ifla_inet6_icmp6_stats): Remove PAF_INDEX_XLAT_VALUE_INDEXED flag
and ARRSZ_PAIR wrapper in print_array_ex calls.
(decode_ifinfomsg): Use PRINT_FIELD_XVAL instead of
PRINT_FIELD_XVAL_SORTED_SIZED.
* rtnl_route.c (decode_nla_rt_proto): Use printxval instead of
printxval_search.
* sock.c (print_ifreq): Use PRINT_FIELD_XVAL instead of
PRINT_FIELD_XVAL_SORTED_SIZED.
* sockaddr.c (print_sockaddr_data_ll, print_sockaddr_data_bt,
print_sockaddr): Use printxval instead of printxval_search and
printxval_index.
* time.c (getitimer, osf_getitimer, setitimer, printclockname): Use
printxval instead of printxval_index.
(do_adjtimex): Use xlookup instead of xlat_idx.
* v4l2.c (print_v4l2_cid): Use xlookup instead of xlat_search.
(print_v4l2_cid): Use xlookup_le instead of xlat_search_eq_or_less.
* tests/btrfs.c: Update xlat handling, use struct xlat_data instead of
struct xlat for XLAT() arrays.
* tests/ioctl_block.c: Likewise.
* tests/ioctl_rtc.c: Likewise.
* tests/printflags.c: Likewise.
* tests/printxval.c: Likewise.
* tests/prlimit64.c: Likewise.
* tests/setrlimit.c: Likewise.
* tests/socketcall.c: Likewise.
* tests/xgetrlimit.c: Likewise.
* tests/xstatfsx.c: Likewise.
* xlat/af_packet_versions.in: Add #value_indexed.
* xlat/arp_hardware_types.in: Add #sorted.
* xlat/ax25_protocols.in: Likewise.
* xlat/bluetooth_l2_cid.in: Likewise.
* xlat/bluetooth_l2_psm.in: Likewise.
* xlat/ethernet_protocols.in: Likewise.
* xlat/evdev_ff_types.in: Likewise.
* xlat/fsmagic.in: Likewise.
* xlat/hw_breakpoint_type.in: Likewise.
* xlat/iffflags.in: Likewise.
* xlat/inet6_if_flags.in: Likewise.
* xlat/inet_protocols.in: Likewise.
* xlat/msgctl_flags.in: Likewise.
* xlat/perf_hw_cache_id.in: Likewise.
* xlat/perf_hw_cache_op_id.in: Likewise.
* xlat/perf_hw_cache_op_result_id.in: Likewise.
* xlat/perf_hw_id.in: Likewise.
* xlat/perf_sw_ids.in: Likewise.
* xlat/perf_type_id.in: Likewise.
* xlat/routing_protocols.in: Likewise.
* xlat/semctl_flags.in: Likewise.
* xlat/shmctl_flags.in: Likewise.
* xlat/smc_decl_codes.in: Likewise.
* xlat/sock_ax25_options.in: Likewise.
* xlat/sock_bluetooth_options.in: Likewise.
* xlat/sock_dccp_options.in: Likewise.
* xlat/sock_tipc_options.in: Likewise.
* xlat/socketlayers.in: Likewise.
* xlat/v4l2_control_classes.in: Likewise.
* xlat/v4l2_pix_fmts.in: Likewise.
* xlat/v4l2_sdr_fmts.in: Likewise.
2018-08-31 23:05:03 +02:00

104 lines
3.6 KiB
Plaintext

#sorted sort -k2,2
{ 0x0000002f, "QNX4_SUPER_MAGIC" },
{ 0x00000187, "AUTOFS_SUPER_MAGIC" },
{ 0x00001373, "DEVFS_SUPER_MAGIC" },
{ 0x0000137d, "EXT_SUPER_MAGIC" },
{ 0x0000137f, "MINIX_SUPER_MAGIC" },
{ 0x0000138f, "MINIX_SUPER_MAGIC2" },
{ 0x00001cd1, "DEVPTS_SUPER_MAGIC" },
{ 0x00002468, "MINIX2_SUPER_MAGIC" },
{ 0x00002478, "MINIX2_SUPER_MAGIC2" },
{ 0x00003434, "NILFS_SUPER_MAGIC" },
{ 0x00004244, "HFS_SUPER_MAGIC" },
{ 0x0000482b, "HFSPLUS_SUPER_MAGIC" },
{ 0x00004d44, "MSDOS_SUPER_MAGIC" },
{ 0x00004d5a, "MINIX3_SUPER_MAGIC" },
{ 0x0000517b, "SMB_SUPER_MAGIC" },
{ 0x0000564c, "NCP_SUPER_MAGIC" },
{ 0x00005df5, "EXOFS_SUPER_MAGIC" },
{ 0x00006969, "NFS_SUPER_MAGIC" },
{ 0x00007275, "ROMFS_MAGIC" },
{ 0x000072b6, "JFFS2_SUPER_MAGIC" },
{ 0x00009660, "ISOFS_SUPER_MAGIC" },
{ 0x00009fa0, "PROC_SUPER_MAGIC" },
{ 0x00009fa1, "OPENPROM_SUPER_MAGIC" },
{ 0x00009fa2, "USBDEVICE_SUPER_MAGIC" },
{ 0x0000adf5, "ADFS_SUPER_MAGIC" },
{ 0x0000adff, "AFFS_SUPER_MAGIC" },
{ 0x0000ef51, "EXT2_OLD_SUPER_MAGIC" },
{ 0x0000ef53, "EXT2_SUPER_MAGIC" },
{ 0x0000f15f, "ECRYPTFS_SUPER_MAGIC" },
{ 0x00011954, "UFS_MAGIC" },
{ 0x0027e0eb, "CGROUP_SUPER_MAGIC" },
{ 0x00414a53, "EFS_SUPER_MAGIC" },
{ 0x00c0ffee, "HOSTFS_SUPER_MAGIC" },
{ 0x00c36400, "CEPH_SUPER_MAGIC" },
{ 0x01021994, "TMPFS_MAGIC" },
{ 0x01021997, "V9FS_MAGIC" },
{ 0x01161970, "GFS2_MAGIC" },
{ 0x012fd16d, "XIAFS_SUPER_MAGIC" },
{ 0x012ff7b4, "XENIX_SUPER_MAGIC" },
{ 0x012ff7b5, "SYSV4_SUPER_MAGIC" },
{ 0x012ff7b6, "SYSV2_SUPER_MAGIC" },
{ 0x012ff7b7, "COH_SUPER_MAGIC" },
{ 0x02011994, "SHMFS_SUPER_MAGIC" },
{ 0x09041934, "ANON_INODE_FS_MAGIC" },
{ 0x0bad1dea, "FUTEXFS_SUPER_MAGIC" },
{ 0x11307854, "MTD_INODE_FS_MAGIC" },
{ 0x13661366, "BALLOON_KVM_MAGIC" },
{ 0x15013346, "UDF_SUPER_MAGIC" },
{ 0x1badface, "BFS_MAGIC" },
{ 0x24051905, "UBIFS_SUPER_MAGIC" },
{ 0x28cd3d45, "CRAMFS_MAGIC" },
{ 0x2fc12fc1, "ZFS_SUPER_MAGIC" },
{ 0x3153464a, "JFS_SUPER_MAGIC" },
{ 0x42465331, "BEFS_SUPER_MAGIC" },
{ 0x42494e4d, "BINFMTFS_MAGIC" },
{ 0x43415d53, "SMACK_MAGIC" },
{ 0x453dcd28, "CRAMFS_MAGIC_WEND" },
{ 0x47504653, "GPFS_SUPER_MAGIC" },
{ 0x50495045, "PIPEFS_MAGIC" },
{ 0x52654973, "REISERFS_SUPER_MAGIC" },
{ 0x5346414f, "AFS_SUPER_MAGIC" },
{ 0x5346544e, "NTFS_SB_MAGIC" },
{ 0x534f434b, "SOCKFS_MAGIC" },
{ 0x54190100, "UFS_CIGAM" },
{ 0x565a4653, "VZFS_SUPER_MAGIC" },
{ 0x57ac6e9d, "STACK_END_MAGIC" },
{ 0x58295829, "ZSMALLOC_MAGIC" },
{ 0x58465342, "XFS_SB_MAGIC" },
{ 0x5a3c69f0, "AAFS_MAGIC" },
{ 0x6165676c, "PSTOREFS_MAGIC" },
{ 0x61756673, "AUFS_SUPER_MAGIC" },
{ 0x62646576, "BDEVFS_MAGIC" },
{ 0x62656570, "CONFIGFS_MAGIC" },
{ 0x62656572, "SYSFS_MAGIC" },
{ 0x63677270, "CGROUP2_SUPER_MAGIC" },
{ 0x64626720, "DEBUGFS_MAGIC" },
{ 0x64646178, "DAXFS_MAGIC" },
{ 0x65735543, "FUSE_CTL_SUPER_MAGIC" },
{ 0x65735546, "FUSE_SUPER_MAGIC" },
{ 0x68191122, "QNX6_SUPER_MAGIC" },
{ 0x6b414653, "AFS_FS_MAGIC" },
{ 0x6e736673, "NSFS_MAGIC" },
{ 0x73636673, "SECURITYFS_MAGIC" },
{ 0x73717368, "SQUASHFS_MAGIC" },
{ 0x73727279, "BTRFS_TEST_MAGIC" },
{ 0x73757245, "CODA_SUPER_MAGIC" },
{ 0x7461636f, "OCFS2_SUPER_MAGIC" },
{ 0x74726163, "TRACEFS_MAGIC" },
{ 0x794c7630, "OVERLAYFS_SUPER_MAGIC" },
{ 0x858458f6, "RAMFS_MAGIC" },
{ 0x9123683e, "BTRFS_SUPER_MAGIC" },
{ 0x958458f6, "HUGETLBFS_MAGIC" },
{ 0xa501fcf5, "VXFS_SUPER_MAGIC" },
{ 0xabba1974, "XENFS_SUPER_MAGIC" },
{ 0xc97e8168, "LOGFS_MAGIC" },
{ 0xcafe4a11, "BPF_FS_MAGIC" },
{ 0xde5e81e4, "EFIVARFS_MAGIC" },
{ 0xf2f52010, "F2FS_SUPER_MAGIC" },
{ 0xf97cff8c, "SELINUX_MAGIC" },
{ 0xf995e849, "HPFS_SUPER_MAGIC" },
{ 0xfe534d42, "SMB2_MAGIC_NUMBER" },
{ 0xff534d42, "CIFS_MAGIC_NUMBER" },