summaryrefslogtreecommitdiff
path: root/ioctl.c
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2017-01-08 00:01:03 +0000
committerDmitry V. Levin <ldv@altlinux.org>2017-01-08 00:01:03 +0000
commit768d7cb78f27524f14206c87b7dd22f1d48ae8ed (patch)
tree1c033d2bce375edb5a743bba452664213ceaa5a9 /ioctl.c
parentcdd27d2088a7225f4789338dbf54d8db4abf4efe (diff)
downloadstrace-768d7cb78f27524f14206c87b7dd22f1d48ae8ed.tar.gz
Split scsi.c
Move decoders of SG_IO v3 and v4 APIs into separate files, compile generic SG_IO decoder unconditionally. * sg_io_v3.c: New file. * sg_io_v4.c: Likewise. * Makefile.am (strace_SOURCES): Add them. * defs.h (decode_sg_io_v3, decode_sg_io_v4): New prototypes. * ioctl.c (ioctl_decode): Remove [HAVE_SCSI_SG_H] condition. * scsi.c: (print_sg_io_res): Remove. (print_sg_io_req): Rename to decode_sg_io, replace print_sg_io_v3_req with decode_sg_io_v3, replace print_sg_io_v4_req with decode_sg_io_v4, compile uncoditionally. (scsi_ioctl): Replace print_sg_io_req and print_sg_io_res with decode_sg_io, compile uncoditionally. Move [HAVE_SCSI_SG_H] code to sg_io_v3.c. Move [HAVE_LINUX_BSG_H] code to sg_io_v4.c.
Diffstat (limited to 'ioctl.c')
-rw-r--r--ioctl.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/ioctl.c b/ioctl.c
index 88c75ff4c..aa1880f8d 100644
--- a/ioctl.c
+++ b/ioctl.c
@@ -255,10 +255,8 @@ ioctl_decode(struct tcb *tcp)
return block_ioctl(tcp, code, arg);
case 'X':
return fs_x_ioctl(tcp, code, arg);
-#ifdef HAVE_SCSI_SG_H
case 0x22:
return scsi_ioctl(tcp, code, arg);
-#endif
case 'L':
return loop_ioctl(tcp, code, arg);
case 'M':