summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorNikolay Borisov <[email protected]>2016-05-30 20:37:36 +0300
committerBrian Behlendorf <[email protected]>2016-07-25 13:21:49 -0700
commit82a1b2d6289f9ceae0bee6f1e71d3bc29a8c5d16 (patch)
tree57c01daa4c2eb3ab7fca9faefee6b071f7b4a2e0 /config
parent77943bc1dc39315feb335b0882dd6c91041538a3 (diff)
Check whether the kernel supports i_uid/gid_read/write helpers
Since the concept of a kuid and the need to translate from it to ordinary integer type was added in kernel version 3.5 implement necessary plumbing to be able to detect this condition during compile time. If the kernel doesn't support the kuid then just fall back to directly accessing the respective struct inode's members Signed-off-by: Nikolay Borisov <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Issue #4685 Issue #227
Diffstat (limited to 'config')
-rw-r--r--config/kernel-kuid-helpers.m422
-rw-r--r--config/kernel.m41
2 files changed, 23 insertions, 0 deletions
diff --git a/config/kernel-kuid-helpers.m4 b/config/kernel-kuid-helpers.m4
new file mode 100644
index 000000000..60713b9d3
--- /dev/null
+++ b/config/kernel-kuid-helpers.m4
@@ -0,0 +1,22 @@
+dnl #
+dnl # 3.5 API change,
+dnl # Since usernamespaces were introduced in kernel version 3.5, it
+dnl # became necessary to go through one more level of indirection
+dnl # when dealing with uid/gid - namely the kuid type.
+dnl #
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_KUID_HELPERS], [
+ AC_MSG_CHECKING([whether i_(uid|gid)_(read|write) exist])
+ ZFS_LINUX_TRY_COMPILE([
+ #include <linux/fs.h>
+ ],[
+ struct inode *ip = NULL;
+ (void) i_uid_read(ip);
+ ],[
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_KUID_HELPERS, 1,
+ [i_(uid|gid)_(read|write) exist])
+ ],[
+ AC_MSG_RESULT(no)
+ ])
+])
diff --git a/config/kernel.m4 b/config/kernel.m4
index 086cd0b05..c9b24cbe8 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -92,6 +92,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
ZFS_AC_KERNEL_MAKE_REQUEST_FN
ZFS_AC_KERNEL_GENERIC_IO_ACCT
ZFS_AC_KERNEL_FPU
+ ZFS_AC_KERNEL_KUID_HELPERS
AS_IF([test "$LINUX_OBJ" != "$LINUX"], [
KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"