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
openzfs · Mar 9, 2019 · bf90948 · bf90948
1 parent b46fd24
commit bf90948
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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 &&