summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDon Brady <[email protected]>2018-09-06 22:44:52 -0600
committerBrian Behlendorf <[email protected]>2018-09-06 21:44:52 -0700
commit73a5ec30bf6facf44a59045ea761a704c5e1b431 (patch)
tree6d36859c3ca5951170a8ba0e017e3e41a22b807f /include
parente7b677aa5de49a6a0619681647c8093900d4cd64 (diff)
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 <[email protected]> Signed-off-by: Don Brady <[email protected]> Closes #7868 Closes #7872
Diffstat (limited to 'include')
-rw-r--r--include/sys/zfs_sysfs.h3
1 files changed, 3 insertions, 0 deletions
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 */