summaryrefslogtreecommitdiffstats
path: root/config/kernel.m4
diff options
context:
space:
mode:
authorRichard Yao <[email protected]>2015-09-07 12:03:19 -0400
committerBrian Behlendorf <[email protected]>2015-09-09 09:29:24 -0700
commit8198d18ca7e05ec30139e10d658a8b06c0ec4c55 (patch)
tree898e7d611c3a7b1575870c26a4b853cfcbed8e7e /config/kernel.m4
parent1e17e910ea315c0c3f732a7e8d31229dbd1e6069 (diff)
Reintroduce IO accounting on zvols on Linux 3.19+
zfsonlinux/zfs@e20cd6f7a8922709b1aa2ecefd783390102d79e0 caused us to lose IO accounting on zvols. When I originally wrote that last year, the symbols we needed to maintain IO accounting were GPL exported, but torvalds/linux@394ffa503bc40e32d7f54a9b817264e81ce131b4 provided suitable symbols for restoring this functionality 4 months later. We can call them to restore the IO accounting on Linux 3.19 and later as well as any older kernels where that patch is backported. Signed-off-by: Richard Yao <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #3741
Diffstat (limited to 'config/kernel.m4')
-rw-r--r--config/kernel.m41
1 files changed, 1 insertions, 0 deletions
diff --git a/config/kernel.m4 b/config/kernel.m4
index 975e42264..e088c4da3 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -94,6 +94,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
ZFS_AC_KERNEL_KMAP_ATOMIC_ARGS
ZFS_AC_KERNEL_FOLLOW_DOWN_ONE
ZFS_AC_KERNEL_MAKE_REQUEST_FN
+ ZFS_AC_KERNEL_GENERIC_IO_ACCT
AS_IF([test "$LINUX_OBJ" != "$LINUX"], [
KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"