mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-23 10:54:35 +03:00
linux: module: weld all but spl.ko into zfs.ko
Originally it was thought it would be useful to split up the kmods by functionality. This would allow external consumers to only load what was needed. However, in practice we've never had a case where this functionality would be needed, and conversely managing multiple kmods can be awkward. Therefore, this change merges all but the spl.ko kmod in to a single zfs.ko kmod. Reviewed-by: Tony Hutter <hutter2@llnl.gov> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> Closes #13274
This commit is contained in:
@@ -3264,7 +3264,6 @@ function set_tunable_impl
|
||||
typeset name="$1"
|
||||
typeset value="$2"
|
||||
typeset mdb_cmd="$3"
|
||||
typeset module="${4:-zfs}"
|
||||
|
||||
eval "typeset tunable=\$$name"
|
||||
case "$tunable" in
|
||||
@@ -3283,14 +3282,13 @@ function set_tunable_impl
|
||||
|
||||
case "$UNAME" in
|
||||
Linux)
|
||||
typeset zfs_tunables="/sys/module/$module/parameters"
|
||||
typeset zfs_tunables="/sys/module/zfs/parameters"
|
||||
echo "$value" >"$zfs_tunables/$tunable"
|
||||
;;
|
||||
FreeBSD)
|
||||
sysctl vfs.zfs.$tunable=$value
|
||||
;;
|
||||
SunOS)
|
||||
[[ "$module" -eq "zfs" ]] || return 1
|
||||
echo "${tunable}/${mdb_cmd}0t${value}" | mdb -kw
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -81,7 +81,7 @@ function nesting_cleanup
|
||||
# before resetting it, it will be left at the modified
|
||||
# value for the remaining tests. That's the reason
|
||||
# we reset it again here just in case.
|
||||
log_must set_tunable_impl MAX_DATASET_NESTING 50 Z zcommon
|
||||
log_must set_tunable64 MAX_DATASET_NESTING 50 Z
|
||||
}
|
||||
|
||||
log_onexit nesting_cleanup
|
||||
@@ -93,13 +93,13 @@ log_must zfs create -p $TESTPOOL/$dsC16
|
||||
log_mustnot zfs rename $TESTPOOL/$dsA02 $TESTPOOL/$dsB15A
|
||||
|
||||
# extend limit
|
||||
log_must set_tunable_impl MAX_DATASET_NESTING 64 Z zcommon
|
||||
log_must set_tunable64 MAX_DATASET_NESTING 64 Z
|
||||
|
||||
log_mustnot zfs rename $TESTPOOL/$dsA02 $TESTPOOL/$dsB16A
|
||||
log_must zfs rename $TESTPOOL/$dsA02 $TESTPOOL/$dsB15A
|
||||
|
||||
# bring back old limit
|
||||
log_must set_tunable_impl MAX_DATASET_NESTING 50 Z zcommon
|
||||
log_must set_tunable64 MAX_DATASET_NESTING 50 Z
|
||||
|
||||
log_mustnot zfs rename $TESTPOOL/$dsC01 $TESTPOOL/$dsB15A47C
|
||||
log_must zfs rename $TESTPOOL/$dsB15A47A $TESTPOOL/$dsB15A47B
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
#
|
||||
# STRATEGY:
|
||||
# 1. Test if we are running on a Linux x86 system with SSE support
|
||||
# 2. If so, check if the zfs_fletcher_4_impl module parameter contains
|
||||
# 2. If so, check if the zfs_fletcher_4_impl module parameter contains
|
||||
# a sse implementation
|
||||
# 3. If not fail the test, otherwise pass it
|
||||
|
||||
@@ -44,7 +44,7 @@ fi
|
||||
|
||||
case "$(uname -m)" in
|
||||
i?86|x86_64)
|
||||
typeset -R modparam="/sys/module/zcommon/parameters/zfs_fletcher_4_impl"
|
||||
typeset -R modparam="/sys/module/zfs/parameters/zfs_fletcher_4_impl"
|
||||
if awk '/^flags/ {exit !/sse/}' /proc/cpuinfo; then
|
||||
log_must grep -q sse "$modparam"
|
||||
log_pass "SIMD instructions supported"
|
||||
|
||||
Reference in New Issue
Block a user