c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-27 03:19:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Reorder ZFS ioctls to fix cross-version compatibility

Browse Source 
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
This commit is contained in:
Lorenz Brun 2019-03-09 22:39:31 +01:00 committed by Brian Behlendorf
parent b46fd243d5
commit bf90948daf
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/sys/fs/zfs.h
View File

@ -1204,9 +1204,9 @@ typedef enum zfs_ioc {
ZFS_IOC_BOOKMARK, /* 0x5a43 */ ZFS_IOC_BOOKMARK, /* 0x5a43 */
ZFS_IOC_GET_BOOKMARKS, /* 0x5a44 */ ZFS_IOC_GET_BOOKMARKS, /* 0x5a44 */
ZFS_IOC_DESTROY_BOOKMARKS, /* 0x5a45 */ ZFS_IOC_DESTROY_BOOKMARKS, /* 0x5a45 */
ZFS_IOC_CHANNEL_PROGRAM, /* 0x5a46 */ ZFS_IOC_RECV_NEW, /* 0x5a46 */
ZFS_IOC_RECV_NEW, /* 0x5a47 */ ZFS_IOC_POOL_SYNC, /* 0x5a47 */
ZFS_IOC_POOL_SYNC, /* 0x5a48 */ ZFS_IOC_CHANNEL_PROGRAM, /* 0x5a48 */
ZFS_IOC_LOAD_KEY, /* 0x5a49 */ ZFS_IOC_LOAD_KEY, /* 0x5a49 */
ZFS_IOC_UNLOAD_KEY, /* 0x5a4a */ ZFS_IOC_UNLOAD_KEY, /* 0x5a4a */
ZFS_IOC_CHANGE_KEY, /* 0x5a4b */ ZFS_IOC_CHANGE_KEY, /* 0x5a4b */

6
tests/zfs-tests/cmd/libzfs_input_check/libzfs_input_check.c
View File

@ -878,9 +878,9 @@ validate_ioc_values(void)
ZFS_IOC_BASE + 67 == ZFS_IOC_BOOKMARK && ZFS_IOC_BASE + 67 == ZFS_IOC_BOOKMARK &&
ZFS_IOC_BASE + 68 == ZFS_IOC_GET_BOOKMARKS && ZFS_IOC_BASE + 68 == ZFS_IOC_GET_BOOKMARKS &&
ZFS_IOC_BASE + 69 == ZFS_IOC_DESTROY_BOOKMARKS && ZFS_IOC_BASE + 69 == ZFS_IOC_DESTROY_BOOKMARKS &&
ZFS_IOC_BASE + 70 == ZFS_IOC_CHANNEL_PROGRAM && ZFS_IOC_BASE + 70 == ZFS_IOC_RECV_NEW &&
ZFS_IOC_BASE + 71 == ZFS_IOC_RECV_NEW && ZFS_IOC_BASE + 71 == ZFS_IOC_POOL_SYNC &&
ZFS_IOC_BASE + 72 == ZFS_IOC_POOL_SYNC && ZFS_IOC_BASE + 72 == ZFS_IOC_CHANNEL_PROGRAM &&
ZFS_IOC_BASE + 73 == ZFS_IOC_LOAD_KEY && ZFS_IOC_BASE + 73 == ZFS_IOC_LOAD_KEY &&
ZFS_IOC_BASE + 74 == ZFS_IOC_UNLOAD_KEY && ZFS_IOC_BASE + 74 == ZFS_IOC_UNLOAD_KEY &&
ZFS_IOC_BASE + 75 == ZFS_IOC_CHANGE_KEY && ZFS_IOC_BASE + 75 == ZFS_IOC_CHANGE_KEY &&