diff options
| author | Lorenz Brun <[email protected]> | 2019-03-09 22:39:31 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-03-09 13:39:31 -0800 |
| commit | bf90948daf9f5057d76a68900e42c87f02ce65fa (patch) | |
| tree | 343de9a48a4e5936ae0376cdfa7269d767888164 | |
| parent | b46fd243d57d0af4b4b568d8c0c4b30b79059ecc (diff) | |
Reorder ZFS ioctls to fix cross-version compatibility
Reorder ZFS ioctls to fix cross-version compatibility.
Reviewed-by: Don Brady <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Reviewed by: Matt Ahrens <[email protected]>
Signed-off-by: Lorenz Brun <[email protected]>
Closes #8484
| -rw-r--r-- | include/sys/fs/zfs.h | 6 | ||||
| -rw-r--r-- | tests/zfs-tests/cmd/libzfs_input_check/libzfs_input_check.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h index 395d2e27f..8a86480a6 100644 --- 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 61ac2fecc..b927cd4e6 100644 --- 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 && |