Reorder ZFS ioctls to fix cross-version compatibility

Reorder ZFS ioctls to fix cross-version compatibility.

Reviewed-by: Don Brady <don.brady@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Signed-off-by: Lorenz Brun <lorenz@dolansoft.org>
Closes #8484

diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h
index 395d2e27f20f1b0afc4c815f61392dc2e6bd8c69..8a86480a699a6b20530e9c1182156c20c6f4ec09 100644 (file)
--- a/include/sys/fs/zfs.h
+++ b/include/sys/fs/zfs.h
@@ -1204,9 +1204,9 @@ typedef enum zfs_ioc {
        ZFS_IOC_BOOKMARK,                       /* 0x5a43 */
        ZFS_IOC_GET_BOOKMARKS,                  /* 0x5a44 */
        ZFS_IOC_DESTROY_BOOKMARKS,              /* 0x5a45 */
-       ZFS_IOC_CHANNEL_PROGRAM,                /* 0x5a46 */
-       ZFS_IOC_RECV_NEW,                       /* 0x5a47 */
-       ZFS_IOC_POOL_SYNC,                      /* 0x5a48 */
+       ZFS_IOC_RECV_NEW,                       /* 0x5a46 */
+       ZFS_IOC_POOL_SYNC,                      /* 0x5a47 */
+       ZFS_IOC_CHANNEL_PROGRAM,                /* 0x5a48 */
        ZFS_IOC_LOAD_KEY,                       /* 0x5a49 */
        ZFS_IOC_UNLOAD_KEY,                     /* 0x5a4a */
        ZFS_IOC_CHANGE_KEY,                     /* 0x5a4b */

diff --git a/tests/zfs-tests/cmd/libzfs_input_check/libzfs_input_check.c b/tests/zfs-tests/cmd/libzfs_input_check/libzfs_input_check.c
index 61ac2feccac36d7bbd9e2a17d751f8c49d55636e..b927cd4e61da11816e9ccba43410531044f87bd3 100644 (file)
--- a/tests/zfs-tests/cmd/libzfs_input_check/libzfs_input_check.c
+++ b/tests/zfs-tests/cmd/libzfs_input_check/libzfs_input_check.c
@@ -878,9 +878,9 @@ validate_ioc_values(void)
            ZFS_IOC_BASE + 67 == ZFS_IOC_BOOKMARK &&
            ZFS_IOC_BASE + 68 == ZFS_IOC_GET_BOOKMARKS &&
            ZFS_IOC_BASE + 69 == ZFS_IOC_DESTROY_BOOKMARKS &&
-           ZFS_IOC_BASE + 70 == ZFS_IOC_CHANNEL_PROGRAM &&
-           ZFS_IOC_BASE + 71 == ZFS_IOC_RECV_NEW &&
-           ZFS_IOC_BASE + 72 == ZFS_IOC_POOL_SYNC &&
+           ZFS_IOC_BASE + 70 == ZFS_IOC_RECV_NEW &&
+           ZFS_IOC_BASE + 71 == ZFS_IOC_POOL_SYNC &&
+           ZFS_IOC_BASE + 72 == ZFS_IOC_CHANNEL_PROGRAM &&
            ZFS_IOC_BASE + 73 == ZFS_IOC_LOAD_KEY &&
            ZFS_IOC_BASE + 74 == ZFS_IOC_UNLOAD_KEY &&
            ZFS_IOC_BASE + 75 == ZFS_IOC_CHANGE_KEY &&