diff options
author | наб <[email protected]> | 2021-05-22 02:38:17 +0200 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2021-05-27 22:31:57 -0700 |
commit | 6316086b7243a4f2da0b154b32659f28bdad2af8 (patch) | |
tree | 0e085a46342d98a9527d8e1a962dfefa9b682c8b /config | |
parent | 7cdd4dd33b1dbfbddc7704692dc5c1d8bc063715 (diff) |
Various Linux kABI cosmetics
Reviewed-by: Tony Hutter <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #12103
Diffstat (limited to 'config')
-rw-r--r-- | config/kernel-blk-queue.m4 | 8 | ||||
-rw-r--r-- | config/kernel-is_owner_or_cap.m4 | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/config/kernel-blk-queue.m4 b/config/kernel-blk-queue.m4 index ff2da92e9..1dced82ce 100644 --- a/config/kernel-blk-queue.m4 +++ b/config/kernel-blk-queue.m4 @@ -23,8 +23,8 @@ AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_PLUG], [ ]) dnl # -dnl # 2.6.32 - 4.11, statically allocated bdi in request_queue -dnl # 4.12 - x.y, dynamically allocated bdi in request_queue +dnl # 2.6.32 - 4.11: statically allocated bdi in request_queue +dnl # 4.12: dynamically allocated bdi in request_queue dnl # AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE_BDI], [ ZFS_LINUX_TEST_SRC([blk_queue_bdi], [ @@ -48,7 +48,7 @@ AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_BDI], [ ]) dnl # -dnl # 2.6.32 - 4.x API, +dnl # 2.6.32 API, dnl # blk_queue_discard() dnl # AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE_DISCARD], [ @@ -71,7 +71,7 @@ AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_DISCARD], [ ]) dnl # -dnl # 4.8 - 4.x API, +dnl # 4.8 API, dnl # blk_queue_secure_erase() dnl # dnl # 2.6.36 - 4.7 API, diff --git a/config/kernel-is_owner_or_cap.m4 b/config/kernel-is_owner_or_cap.m4 index 3c3c6ad22..a90cf3da6 100644 --- a/config/kernel-is_owner_or_cap.m4 +++ b/config/kernel-is_owner_or_cap.m4 @@ -4,6 +4,10 @@ dnl # The is_owner_or_cap() macro was renamed to inode_owner_or_capable(), dnl # This is used for permission checks in the xattr and file attribute call dnl # paths. dnl # +dnl # 5.12 API change, +dnl # inode_owner_or_capable() now takes struct user_namespace * +dnl # to support idmapped mounts +dnl # AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OWNER_OR_CAPABLE], [ ZFS_LINUX_TEST_SRC([inode_owner_or_capable], [ #include <linux/fs.h> |