c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-17 01:51:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Unconditionally load core kernel modules

Browse Source 
Loading and unloading the zlib modules as part of the zfs.sh
script has proven a little problematic for a few reasons.

  * First, your kernel may not need to load either zlib_inflate
    or zlib_deflate.  This functionality may be built directly in
    to your kernel.  It depends entirely on what your distribution
    decided was the right thing to do.

  * Second, even if you do manage to load the correct modules you
    may not be able to unload them.  There may other consumers
    of the modules with a reference preventing the unload.

To avoid both of these issues the test scripts have been updated to
attempt to unconditionally load all modules listed in KERNEL_MODULES.
If the module is successfully loaded you must have needed it. If
the module can't be loaded that almost certainly means either it is
built in to your kernel or is already being used by another consumer.
In both cases this is not an issue and we can move on to the spl/zfs
modules.

Finally, by removing these kernel modules from the MODULES list
we ensure they are never unloaded during 'zfs.sh -u'.  This avoids
the issue of the script failing because there is another consumer
using the module we were not aware of.  In other words the script
restricts unloading modules to only the spl/zfs modules.

Closes #78
This commit is contained in:
Brian Behlendorf 2010-11-11 10:00:39 -08:00
parent e06be58641
commit cf47fad67d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/common.sh.in
View File

@ -11,7 +11,8 @@ SCRIPT_CONFIG=zfs-script-config.sh
if [ -f "${basedir}/../${SCRIPT_CONFIG}" ]; then if [ -f "${basedir}/../${SCRIPT_CONFIG}" ]; then
. "${basedir}/../${SCRIPT_CONFIG}" . "${basedir}/../${SCRIPT_CONFIG}"
else else
MODULES=(zlib_deflate spl splat zavl znvpair zunicode zcommon zfs) KERNEL_MODULES=(zlib_deflate zlib_inflate)
MODULES=(spl splat zavl znvpair zunicode zcommon zfs)
fi fi
PROG="<define PROG>" PROG="<define PROG>"
@ -162,7 +163,7 @@ load_module() {
echo "Loading ${NAME} ($@)" echo "Loading ${NAME} ($@)"
fi fi
${LDMOD} $* || ERROR="Failed to load $1" return 1 ${LDMOD} $* &>/dev/null || ERROR="Failed to load $1" return 1
return 0 return 0
} }
@ -170,6 +171,10 @@ load_module() {
load_modules() { load_modules() {
mkdir -p /etc/zfs mkdir -p /etc/zfs
for MOD in ${KERNEL_MODULES[*]}; do
load_module ${MOD}
done
for MOD in ${MODULES[*]}; do for MOD in ${MODULES[*]}; do
local NAME=`basename ${MOD} .ko` local NAME=`basename ${MOD} .ko`
local VALUE= local VALUE=

2
zfs-script-config.sh.in
View File

@ -39,6 +39,7 @@ LDMOD=/sbin/insmod
KERNEL_MODULES=( \ KERNEL_MODULES=( \
${KERNELMOD}/lib/zlib_deflate/zlib_deflate.ko \ ${KERNELMOD}/lib/zlib_deflate/zlib_deflate.ko \
${KERNELMOD}/lib/zlib_inflate/zlib_inflate.ko \
) )
SPL_MODULES=( \ SPL_MODULES=( \
@ -59,7 +60,6 @@ ZPIOS_MODULES=( \
) )
MODULES=( \ MODULES=( \
${KERNEL_MODULES[*]} \
${SPL_MODULES[*]} \ ${SPL_MODULES[*]} \
${ZFS_MODULES[*]} \ ${ZFS_MODULES[*]} \
) )