aboutsummaryrefslogtreecommitdiffstats
path: root/module/spl/spl-zlib.c
diff options
context:
space:
mode:
authorOlaf Faaland <[email protected]>2018-12-10 16:52:49 -0800
committerBrian Behlendorf <[email protected]>2018-12-10 16:52:49 -0800
commitfa61e72340c1b47f33b5290e5eeb7e05e62eabf0 (patch)
tree3266dcf9ec7af4dd1527713980c6adee2051503f /module/spl/spl-zlib.c
parent900d09b285107e13fa0bdb8378274dff89347181 (diff)
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 <[email protected]> Reviewed-by: Tony Hutter <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Olaf Faaland <[email protected]> Closes #8195
Diffstat (limited to 'module/spl/spl-zlib.c')
0 files changed, 0 insertions, 0 deletions