diff options
| author | Richard Yao <[email protected]> | 2015-09-07 12:03:19 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-09-09 09:29:24 -0700 |
| commit | 8198d18ca7e05ec30139e10d658a8b06c0ec4c55 (patch) | |
| tree | 898e7d611c3a7b1575870c26a4b853cfcbed8e7e /include/linux | |
| parent | 1e17e910ea315c0c3f732a7e8d31229dbd1e6069 (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 'include/linux')
| -rw-r--r-- | include/linux/blkdev_compat.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/blkdev_compat.h b/include/linux/blkdev_compat.h index c3c466bc2..162b315ea 100644 --- a/include/linux/blkdev_compat.h +++ b/include/linux/blkdev_compat.h @@ -343,4 +343,9 @@ blk_queue_discard_granularity(struct request_queue *q, unsigned int dg) */ #define VDEV_HOLDER ((void *)0x2401de7) +#ifndef HAVE_GENERIC_IO_ACCT +#define generic_start_io_acct(rw, slen, part) ((void)0) +#define generic_end_io_acct(rw, part, start_jiffies) ((void)0) +#endif + #endif /* _ZFS_BLKDEV_H */ |