Linux: Add support for the BLKFLSBUF ioctl

diff --git a/NEWS b/NEWS
index bbcb9625ee26e01ebbdb1f6689b4434ff236aaf1..375751b3e2560d3a3f0151a39aa69bd7f762c5b1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -96,6 +96,7 @@ where XXXXXX is the bug number as listed below.
 
 n-i-bz  Fix missing workq_ops operations (macOS)
 n-i-bz  fix bug in strspn replacement
+n-i-bz  Add support for the Linux BLKFLSBUF ioctl
 
 Release 3.13.0 (15 June 2017)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index 4120c1d09d545de035021af0a310b95c1a3e97ba..beb9dff6b1ab47c32b2ccbbe829cf85156582bc5 100644 (file)
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -6886,6 +6886,8 @@ PRE(sys_ioctl)
    case VKI_BLKGETSIZE:
       PRE_MEM_WRITE( "ioctl(BLKGETSIZE)", ARG3, sizeof(unsigned long));
       break;
+   case VKI_BLKFLSBUF:
+      break;
    case VKI_BLKRASET:
       break;
    case VKI_BLKRAGET:
@@ -9638,6 +9640,8 @@ POST(sys_ioctl)
    case VKI_BLKGETSIZE:
       POST_MEM_WRITE(ARG3, sizeof(unsigned long));
       break;
+   case VKI_BLKFLSBUF:
+      break;
    case VKI_BLKRASET:
       break;
    case VKI_BLKRAGET:

diff --git a/include/vki/vki-linux.h b/include/vki/vki-linux.h
index faacf7fb379f92702ffa8a3dd58e9b9086c7a276..cfec2350b590c716ca96ed45dda308237c819c28 100644 (file)
--- a/include/vki/vki-linux.h
+++ b/include/vki/vki-linux.h
@@ -1775,18 +1775,23 @@ struct vki_ppdev_frob_struct {
 
 #define VKI_BLKROSET   _VKI_IO(0x12,93)        /* set device read-only (0 = read-write) */
 #define VKI_BLKROGET   _VKI_IO(0x12,94)        /* get read-only status (0 = read_write) */
+#define VKI_BLKRRPART  _VKI_IO(0x12,95) /* re-read partition table */
 #define VKI_BLKGETSIZE _VKI_IO(0x12,96) /* return device size /512 (long *arg) */
+#define VKI_BLKFLSBUF  _VKI_IO(0x12,97) /* flush buffer cache */
 #define VKI_BLKRASET   _VKI_IO(0x12,98)        /* set read ahead for block device */
 #define VKI_BLKRAGET   _VKI_IO(0x12,99)        /* get current read ahead setting */
 #define VKI_BLKFRASET  _VKI_IO(0x12,100)/* set filesystem (mm/filemap.c) read-ahead */
 #define VKI_BLKFRAGET  _VKI_IO(0x12,101)/* get filesystem (mm/filemap.c) read-ahead */
+#define VKI_BLKSECTSET _VKI_IO(0x12,102)/* set max sectors per request (ll_rw_blk.c) */
 #define VKI_BLKSECTGET _VKI_IO(0x12,103)/* get max sectors per request (ll_rw_blk.c) */
 #define VKI_BLKSSZGET  _VKI_IO(0x12,104)/* get block device sector size */
 #define VKI_BLKBSZGET  _VKI_IOR(0x12,112,vki_size_t)
 #define VKI_BLKBSZSET  _VKI_IOW(0x12,113,vki_size_t)
 #define VKI_BLKGETSIZE64 _VKI_IOR(0x12,114,vki_size_t) /* return device size in bytes (u64 *arg) */
+#define VKI_BLKDISCARD _VKI_IO(0x12,119)
 #define VKI_BLKPBSZGET _VKI_IO(0x12,123)
 #define VKI_BLKDISCARDZEROES _VKI_IO(0x12,124)
+#define VKI_BLKZEROOUT _VKI_IO(0x12,127)
 
 #define VKI_FIBMAP     _VKI_IO(0x00,1) /* bmap access */
 #define VKI_FIGETBSZ    _VKI_IO(0x00,2)        /* get the block size used for bmap */