diff options
| -rw-r--r-- | config/kernel-misc-minor.m4 | 10 | ||||
| -rw-r--r-- | 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 3917e28ff..a020d2ebc 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 e19ed34df..7c469246d 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -7074,12 +7074,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 @@ -7100,7 +7100,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); |