From 73a5ec30bf6facf44a59045ea761a704c5e1b431 Mon Sep 17 00:00:00 2001 From: Don Brady Date: Thu, 6 Sep 2018 22:44:52 -0600 Subject: Fix in-kernel sysfs entries The recent sysfs zfs properties feature breaks the in-kernel builds of zfs (sans module). When not built as a module add the sysfs entries under /sys/fs/zfs/. Reviewed-by: Brian Behlendorf Signed-off-by: Don Brady Closes #7868 Closes #7872 --- include/sys/zfs_sysfs.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/sys') diff --git a/include/sys/zfs_sysfs.h b/include/sys/zfs_sysfs.h index 7c4a0304f..925d7ad54 100644 --- a/include/sys/zfs_sysfs.h +++ b/include/sys/zfs_sysfs.h @@ -35,6 +35,7 @@ void zfs_sysfs_fini(void); #define zfs_sysfs_init() #define zfs_sysfs_fini() +boolean_t zfs_mod_supported(const char *, const char *); #endif #define ZFS_SYSFS_POOL_PROPERTIES "properties.pool" @@ -43,5 +44,7 @@ void zfs_sysfs_fini(void); #define ZFS_SYSFS_POOL_FEATURES "features.pool" #define ZFS_SYSFS_DIR "/sys/module/zfs" +/* Alternate location when ZFS is built as part of the kernel (rare) */ +#define ZFS_SYSFS_ALT_DIR "/sys/fs/zfs" #endif /* _SYS_ZFS_SYSFS_H */ -- cgit v1.2.3