From d9cfc1f3f5a75f1dbb14a56cd3da9db6b7a48065 Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Sun, 1 May 2016 19:04:45 -0400 Subject: [PATCH] Linux 4.5: no highmem in symlink ops Symlink bodies in the pagecache should not be in highmem, as upstream converted in commit 21fc61c73. Change-Id: I1e4c3c51308df096cdfa4d5e7b16279e275e7f41 Reviewed-on: https://gerrit.openafs.org/12264 Tested-by: BuildBot Reviewed-by: Joe Gorse Tested-by: Joe Gorse Reviewed-by: Benjamin Kaduk --- acinclude.m4 | 3 +++ src/afs/LINUX/osi_vnodeops.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 index 745f38e12a..f2153193a3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1091,6 +1091,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*) [#include #include ], [kthread_run(NULL, NULL, "test");]) + AC_CHECK_LINUX_FUNC([inode_nohighmem], + [#include ], + [inode_nohighmem(NULL);]) dnl Consequences - things which get set as a result of the dnl above tests diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c index eb8a269bd2..6a8e95b465 100644 --- a/src/afs/LINUX/osi_vnodeops.c +++ b/src/afs/LINUX/osi_vnodeops.c @@ -3149,6 +3149,9 @@ afs_fill_inode(struct inode *ip, struct vattr *vattr) } else if (S_ISLNK(ip->i_mode)) { ip->i_op = &afs_symlink_iops; +#if defined(HAVE_LINUX_INODE_NOHIGHMEM) + inode_nohighmem(ip); +#endif #if defined(USABLE_KERNEL_PAGE_SYMLINK_CACHE) ip->i_data.a_ops = &afs_symlink_aops; ip->i_mapping = &ip->i_data;