]> granicus.if.org Git - zfs/commit
Rename macro ZFS_MINOR due to Lustre conflict
authorOlaf Faaland <faaland1@llnl.gov>
Tue, 11 Dec 2018 00:52:49 +0000 (16:52 -0800)
committerTony Hutter <hutter2@llnl.gov>
Fri, 22 Feb 2019 17:47:34 +0000 (09:47 -0800)
commitf325d76e962fa569503189797ffdd447114db88c
tree28a8e1ed424a8874b821d4a777d7263e1b98ab6f
parente3fb781c5fdaaba0ee788a1602490dc9e3a7c7d5
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
config/kernel-misc-minor.m4
module/zfs/zfs_ioctl.c