From f325d76e962fa569503189797ffdd447114db88c Mon Sep 17 00:00:00 2001 From: Olaf Faaland Date: Mon, 10 Dec 2018 16:52:49 -0800 Subject: [PATCH] Rename macro ZFS_MINOR due to Lustre conflict Macro ZFS_MINOR, introduced in commit a6cc9756 to record the chosen static minor number for /dev/zfs, conflicts with an existing macro in Lustre. The lustre macro (along with _MAJOR, _PATCH, _FIX) is used to record the zfsonlinux version Lustre is being built against. Since the Lustre macro came first, and is used in past versions of lustre at least going back to 2.10, it makes sense to rename the macro in ZFS instead of doing so in Lustre which would require backporting the patch. Reviewed-by: Giuseppe Di Natale Reviewed-by: Tony Hutter Reviewed-by: Brian Behlendorf Signed-off-by: Olaf Faaland Closes #8195 --- config/kernel-misc-minor.m4 | 10 +++++----- module/zfs/zfs_ioctl.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/kernel-misc-minor.m4 b/config/kernel-misc-minor.m4 index 3917e28ff6..a020d2ebca 100644 --- a/config/kernel-misc-minor.m4 +++ b/config/kernel-misc-minor.m4 @@ -11,15 +11,15 @@ AC_DEFUN([ZFS_AC_KERNEL_MISC_MINOR], [ for i in $(seq 249 -1 200); do if ! grep -q "^#define\s\+.*_MINOR\s\+.*$i" \ ${LINUX}/include/linux/miscdevice.h; then - ZFS_MINOR="$i" - AC_MSG_RESULT($ZFS_MINOR) - AC_DEFINE_UNQUOTED([ZFS_MINOR], [$ZFS_MINOR], - [/dev/zfs minor]) + ZFS_DEVICE_MINOR="$i" + AC_MSG_RESULT($ZFS_DEVICE_MINOR) + AC_DEFINE_UNQUOTED([ZFS_DEVICE_MINOR], + [$ZFS_DEVICE_MINOR], [/dev/zfs minor]) break fi done - AS_IF([ test -z "$ZFS_MINOR"], [ + AS_IF([ test -z "$ZFS_DEVICE_MINOR"], [ AC_MSG_ERROR([ *** No available misc minor numbers available for use.]) ]) diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index a79decb966..a97dcf4b70 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -6634,12 +6634,12 @@ static const struct file_operations zfsdev_fops = { }; static struct miscdevice zfs_misc = { - .minor = ZFS_MINOR, + .minor = ZFS_DEVICE_MINOR, .name = ZFS_DRIVER, .fops = &zfsdev_fops, }; -MODULE_ALIAS_MISCDEV(ZFS_MINOR); +MODULE_ALIAS_MISCDEV(ZFS_DEVICE_MINOR); MODULE_ALIAS("devname:zfs"); static int @@ -6660,7 +6660,7 @@ zfs_attach(void) */ printk(KERN_INFO "ZFS: misc_register() with static minor %d " "failed %d, retrying with MISC_DYNAMIC_MINOR\n", - ZFS_MINOR, error); + ZFS_DEVICE_MINOR, error); zfs_misc.minor = MISC_DYNAMIC_MINOR; error = misc_register(&zfs_misc);