Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch

This commit is contained in:
Brian Behlendorf 2009-01-14 10:42:47 -08:00
parent 0ba5ba5928 6a8da31d70
commit 8778a30cda
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libzfs/libzfs_mount.c
View File

@ -1436,13 +1436,13 @@ zfs_is_shared(zfs_handle_t *zhp)
int int
zpool_enable_datasets(zpool_handle_t *zhp, const char *mntopts, int flags) zpool_enable_datasets(zpool_handle_t *zhp, const char *mntopts, int flags)
{ {
return B_TRUE; return B_FALSE;
} }
int int
zpool_disable_datasets(zpool_handle_t *zhp, boolean_t force) zpool_disable_datasets(zpool_handle_t *zhp, boolean_t force)
{ {
return B_TRUE; return B_FALSE;
} }
#endif /* HAVE_ZPL */ #endif /* HAVE_ZPL */

10
scripts/zpios.sh
View File

@ -23,7 +23,10 @@ echo
echo "rm /etc/zfs/zpool.cache" || exit 1 echo "rm /etc/zfs/zpool.cache" || exit 1
rm -f /etc/zfs/zpool.cache rm -f /etc/zfs/zpool.cache
./zfs.sh -v "${SPL_OPTIONS}" "${ZPOOL_OPTIONS}" || exit 1
echo "./zfs.sh"
./zfs.sh "${SPL_OPTIONS}" "${ZPOOL_OPTIONS}" || exit 1
echo
echo ---------------------- SPL Sysctl Tunings ------------------------------ echo ---------------------- SPL Sysctl Tunings ------------------------------
sysctl -A | grep spl sysctl -A | grep spl
@ -121,8 +124,10 @@ if [ -n "${ZPIOS_POST}" ]; then
${ZPIOS_POST} || exit 1 ${ZPIOS_POST} || exit 1
fi fi
echo
echo "${CMDDIR}/zpool/zpool destroy lustre" echo "${CMDDIR}/zpool/zpool destroy lustre"
${CMDDIR}/zpool/zpool destroy lustre ${CMDDIR}/zpool/zpool destroy lustre
echo
echo ---------------------- SPL Sysctl Tunings ------------------------------ echo ---------------------- SPL Sysctl Tunings ------------------------------
sysctl -A | grep spl sysctl -A | grep spl
@ -148,6 +153,7 @@ if [ -f /proc/spl/kmem/slab ]; then
echo echo
fi fi
./zfs.sh -vu || exit 1 echo "./zfs.sh -u"
./zfs.sh -u || exit 1
exit 0 exit 0