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

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

This commit is contained in:
Brian Behlendorf 2010-05-18 15:13:51 -07:00
parent 523d9c87c9 c287454d78
commit f26fd3eab8
3 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
config/zfs-build.m4
View File

@ -7,28 +7,34 @@ AC_DEFUN([ZFS_AC_LICENSE], [
]) ])
AC_DEFUN([ZFS_AC_DEBUG], [ AC_DEFUN([ZFS_AC_DEBUG], [
AC_MSG_CHECKING([whether debugging is enabled]) AC_MSG_CHECKING([whether debugging is enabled])
AC_ARG_ENABLE( [debug], AC_ARG_ENABLE( [debug],
AS_HELP_STRING([--enable-debug], AS_HELP_STRING([--enable-debug],
[Enable generic debug support (default off)]), [Enable generic debug support (default off)]),
[ case "$enableval" in [ case "$enableval" in
yes) zfs_ac_debug=yes ;; yes) zfs_ac_debug=yes ;;
no) zfs_ac_debug=no ;; no) zfs_ac_debug=no ;;
*) AC_MSG_RESULT([Error!]) *) AC_MSG_RESULT([Error!])
AC_MSG_ERROR([Bad value "$enableval" for --enable-debug]) ;; AC_MSG_ERROR([Bad value "$enableval" for --enable-debug]) ;;
esac ] esac ]
) )
if test "$zfs_ac_debug" = yes; then if test "$zfs_ac_debug" = yes; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG " AC_DEFINE([DEBUG], [1],
[Define to 1 to enable debug tracing])
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG "
HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG " HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG "
else USERDEBUG="-DDEBUG"
AC_MSG_RESULT([no]) else
AC_DEFINE([NDEBUG], [1], AC_MSG_RESULT([no])
[Define to 1 to disable debug tracing]) AC_DEFINE([NDEBUG], [1],
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG " [Define to 1 to disable debug tracing])
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG "
HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG " HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG "
fi USERDEBUG="-DNDEBUG"
fi
AC_SUBST(USERDEBUG)
]) ])
AC_DEFUN([ZFS_AC_CONFIG_SCRIPT], [ AC_DEFUN([ZFS_AC_CONFIG_SCRIPT], [

14
scripts/zpios.sh
View File

@ -33,6 +33,7 @@ DESCRIPTION:
OPTIONS: OPTIONS:
-h Show this message -h Show this message
-v Verbose -v Verbose
-f Force everything
-p Enable profiling -p Enable profiling
-c Zpool configuration -c Zpool configuration
-t Zpios test -t Zpios test
@ -173,7 +174,7 @@ ZPIOS_OPTIONS=
ZPOOL_OPTIONS="" ZPOOL_OPTIONS=""
ZFS_OPTIONS="" ZFS_OPTIONS=""
while getopts 'hvpc:t:o:l:s:' OPTION; do while getopts 'hvfpc:t:o:l:s:' OPTION; do
case $OPTION in case $OPTION in
h) h)
usage usage
@ -183,6 +184,10 @@ while getopts 'hvpc:t:o:l:s:' OPTION; do
VERBOSE=1 VERBOSE=1
VERBOSE_FLAG="-v" VERBOSE_FLAG="-v"
;; ;;
f)
FORCE=1
FORCE_FLAG="-f"
;;
p) p)
PROFILE=1 PROFILE=1
;; ;;
@ -237,7 +242,8 @@ if [ ${VERBOSE} ]; then
fi fi
# Create the zpool configuration # Create the zpool configuration
${ZPOOL_CREATE_SH} ${VERBOSE_FLAG} -p ${ZPOOL_NAME} -c ${ZPOOL_CONFIG} \ ${ZPOOL_CREATE_SH} ${VERBOSE_FLAG} ${FORCE_FLAG} \
-p ${ZPOOL_NAME} -c ${ZPOOL_CONFIG} \
-l "${ZPOOL_OPTIONS}" -s "${ZFS_OPTIONS}" || exit 1 -l "${ZPOOL_OPTIONS}" -s "${ZFS_OPTIONS}" || exit 1
if [ ${PROFILE} ]; then if [ ${PROFILE} ]; then
@ -256,8 +262,8 @@ if [ ${VERBOSE} ]; then
fi fi
# Destroy the zpool configuration # Destroy the zpool configuration
${ZPOOL_CREATE_SH} ${VERBOSE_FLAG} -p ${ZPOOL_NAME} \ ${ZPOOL_CREATE_SH} ${VERBOSE_FLAG} ${FORCE_FLAG} \
-c ${ZPOOL_CONFIG} -d || exit 1 -p ${ZPOOL_NAME} -c ${ZPOOL_CONFIG} -d || exit 1
# Unload the test module stack and wait for device removal # Unload the test module stack and wait for device removal
unload_modules unload_modules

2
scripts/zpool-create.sh
View File

@ -24,10 +24,10 @@ DESCRIPTION:
OPTIONS: OPTIONS:
-h Show this message -h Show this message
-v Verbose -v Verbose
-f Force everything
-c Configuration for zpool -c Configuration for zpool
-p Name for zpool -p Name for zpool
-d Destroy zpool (default create) -d Destroy zpool (default create)
-f Force everything
-l Additional zpool options -l Additional zpool options
-s Additional zfs options -s Additional zfs options