Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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 <guss80@gmail.com>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
Closes #8195
This commit is contained in:
Olaf Faaland 2018-12-10 16:52:49 -08:00 committed by Tony Hutter
parent e3fb781c5f
commit f325d76e96
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/kernel-misc-minor.m4
View File

@ -11,15 +11,15 @@ AC_DEFUN([ZFS_AC_KERNEL_MISC_MINOR], [
for i in $(seq 249 -1 200); do for i in $(seq 249 -1 200); do
if ! grep -q "^#define\s\+.*_MINOR\s\+.*$i" \ if ! grep -q "^#define\s\+.*_MINOR\s\+.*$i" \
${LINUX}/include/linux/miscdevice.h; then ${LINUX}/include/linux/miscdevice.h; then
ZFS_MINOR="$i" ZFS_DEVICE_MINOR="$i"
AC_MSG_RESULT($ZFS_MINOR) AC_MSG_RESULT($ZFS_DEVICE_MINOR)
AC_DEFINE_UNQUOTED([ZFS_MINOR], [$ZFS_MINOR], AC_DEFINE_UNQUOTED([ZFS_DEVICE_MINOR],
[/dev/zfs minor]) [$ZFS_DEVICE_MINOR], [/dev/zfs minor])
break break
fi fi
done done
AS_IF([ test -z "$ZFS_MINOR"], [ AS_IF([ test -z "$ZFS_DEVICE_MINOR"], [
AC_MSG_ERROR([ AC_MSG_ERROR([
*** No available misc minor numbers available for use.]) *** No available misc minor numbers available for use.])
]) ])

6
module/zfs/zfs_ioctl.c
View File

@ -6634,12 +6634,12 @@ static const struct file_operations zfsdev_fops = {
}; };
static struct miscdevice zfs_misc = { static struct miscdevice zfs_misc = {
.minor = ZFS_MINOR, .minor = ZFS_DEVICE_MINOR,
.name = ZFS_DRIVER, .name = ZFS_DRIVER,
.fops = &zfsdev_fops, .fops = &zfsdev_fops,
}; };
MODULE_ALIAS_MISCDEV(ZFS_MINOR); MODULE_ALIAS_MISCDEV(ZFS_DEVICE_MINOR);
MODULE_ALIAS("devname:zfs"); MODULE_ALIAS("devname:zfs");
static int static int
@ -6660,7 +6660,7 @@ zfs_attach(void)
*/ */
printk(KERN_INFO "ZFS: misc_register() with static minor %d " printk(KERN_INFO "ZFS: misc_register() with static minor %d "
"failed %d, retrying with MISC_DYNAMIC_MINOR\n", "failed %d, retrying with MISC_DYNAMIC_MINOR\n",
ZFS_MINOR, error); ZFS_DEVICE_MINOR, error);
zfs_misc.minor = MISC_DYNAMIC_MINOR; zfs_misc.minor = MISC_DYNAMIC_MINOR;
error = misc_register(&zfs_misc); error = misc_register(&zfs_misc);