diff options
| author | Coleman Kane <[email protected]> | 2021-12-03 22:00:10 -0500 |
|---|---|---|
| committer | Tony Hutter <[email protected]> | 2021-12-07 13:14:23 -0800 |
| commit | bef7c02c8141088a4b4de4e189d347cae94a66cb (patch) | |
| tree | ab667795dc67f80c95dd476bb606f465b8dbfdc7 /module | |
| parent | ea61e074132f9371c3d1932ed8e24767a087c80c (diff) | |
Linux 5.16: The blk-cgroup.h header is where struct blkcg_gq is defined
The definition of struct blkcg_gq was moved into blk-cgroup.h, which is
a header that's been in Linux since 2015. This is used by
vdev_blkg_tryget() in module/os/linux/zfs/vdev_disk.c. Since the kernel
for CentOS 7 and similar-generation releases doesn't have this header,
its inclusion is guarded by a configure test.
Reviewed-by: Tony Hutter <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes #12819
Diffstat (limited to 'module')
| -rw-r--r-- | module/os/linux/zfs/vdev_disk.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/module/os/linux/zfs/vdev_disk.c b/module/os/linux/zfs/vdev_disk.c index 0e884f426..a432a7364 100644 --- a/module/os/linux/zfs/vdev_disk.c +++ b/module/os/linux/zfs/vdev_disk.c @@ -37,6 +37,9 @@ #include <linux/blkpg.h> #include <linux/msdos_fs.h> #include <linux/vfs_compat.h> +#ifdef HAVE_LINUX_BLK_CGROUP_HEADER +#include <linux/blk-cgroup.h> +#endif typedef struct vdev_disk { struct block_device *vd_bdev; |