summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Behlendorf <behlendorf1@llnl.gov>2021-11-04 17:03:50 -0700
committerTony Hutter <hutter2@llnl.gov>2021-11-12 16:31:55 -0800
commitb8b3b93ebbc96f99935b3cb7ad3d1eab36d08fa1 (patch)
tree3bc9262595e6eaf7ee804abcdd4a7e2faf55b573
parent586358102ed689a7b25dc7e67f6322b20d2f261a (diff)
Linux 5.16 compat: linux/elevator.h
Commit https://github.com/torvalds/linux/commit/2e9bc346 moved the elevator.h header under the block/ directory as part of some refactoring. This turns out not to be a problem since there's no longer anything we need from the header. This has been the case for some time, this change removes the elevator.h include and replaces it with a major.h include. Reviewed-by: Alexander Lobakin <alobakin@pm.me> Reviewed-by: Tony Hutter <hutter2@llnl.gov> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #12725
-rw-r--r--include/os/linux/kernel/linux/blkdev_compat.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/os/linux/kernel/linux/blkdev_compat.h b/include/os/linux/kernel/linux/blkdev_compat.h
index c36d14baf..2865a6af8 100644
--- a/include/os/linux/kernel/linux/blkdev_compat.h
+++ b/include/os/linux/kernel/linux/blkdev_compat.h
@@ -30,9 +30,9 @@
#define _ZFS_BLKDEV_H
#include <linux/blkdev.h>
-#include <linux/elevator.h>
#include <linux/backing-dev.h>
#include <linux/hdreg.h>
+#include <linux/major.h>
#include <linux/msdos_fs.h> /* for SECTOR_* */
#ifndef HAVE_BLK_QUEUE_FLAG_SET